Add missing code to tmpfile cleanup hooks

2 files changed, 12 insertions, 4 deletions

diff --git a/bin/rndl b/bin/rndl
index 3e92044c..14721539 100755
--- a/bin/rndl
+++ b/bin/rndl
@@ -3,10 +3,14 @@
 if [ "$#" -eq 0 ] ; then
     td=
     cleanup() {
-        rm -fr -- "$td"
+        [ "$td" ] && rm -fr -- "$td"
+        if [ "$1" != EXIT ] ; then
+            trap - "$1"
+            kill "-$1" "$$"
+        fi
     }
     for sig in EXIT HUP INT TERM ; do
-        trap cleanup "$sig"
+        trap "cleanup $sig" "$sig"
     done
     td=$(mktd rndl) || exit
     set -- "$td"/stdin
diff --git a/bin/tlcs b/bin/tlcs
index 8ba6cefc..996fb5ce 100755
--- a/bin/tlcs
+++ b/bin/tlcs
@@ -70,10 +70,14 @@ fi
 # Temporary directory for the FIFOs
 td=
 cleanup() {
-    rm -fr -- "$td"
+    [ "$td" ] && rm -fr -- "$td"
+    if [ "$1" != EXIT ] ; then
+        trap - "$1"
+        kill "-$1" "$$"
+    fi
 }
 for sig in EXIT HUP INT TERM ; do
-    trap cleanup "$sig"
+    trap "cleanup $sig" "$sig"
 done
 td=$(mktd "$self") || exit