Bug 875: faxsetup and faxaddmodem may forget locks and temporary files when exiting

Tim's patch moves all the removal to a function, and uses it to exit
instead of calling "exit 1" everywhere.

diff --git a/etc/faxaddmodem.sh.in b/etc/faxaddmodem.sh.in
index 43b4e3c233761ac7caa950cbe57c20c6186dd814..2ef144717747b80b6d80312ce7dde6147e9fb30d 100644 (file)
--- a/etc/faxaddmodem.sh.in
+++ b/etc/faxaddmodem.sh.in
@@ -45,6 +45,11 @@
 #
 SPOOL=@SPOOL@
 
+die()
+{
+    kill -1 $$                 # use kill so trap handler is called
+}
+
 SPEED=
 DOFUSER=no
 while [ x"$1" != x"" ] ; do
@@ -267,7 +272,7 @@ can use this script to setup a modem for use.  Rerun the faxsetup
 command to correct this problem.
 
 EOF
-    exit 1
+    die
 fi
 
 PORT=`ttyPort $TTY`                    # shortened tty port name
@@ -283,7 +288,7 @@ CONFIG=$CPATH.$DEVID                        # HylaFAX configuration filename
 for x in $LOCKX; do
     if [ -f $x ]; then
        echo "Sorry, the device is currently in use by another program."
-       exit 1
+       die
     fi
 done
 
@@ -860,8 +865,7 @@ if [ -z "$SPEED" ]; then
        echo "Unable to deduce DTE-DCE speed; check that you are using the"
        echo "correct device and/or that your modem is setup properly.  If"
        echo "all else fails, try the -s option to lock the speed."
-       @RM@ -f $JUNK; @RM@ -fr $TMPDIR
-       exit 1
+       die
     fi
     echo " OK."
 else
@@ -1112,7 +1116,7 @@ software does not support it and you will need to write a driver that
 supports it.
 
 EOF
-    exit 1
+    die
 }
 
 echo ""
@@ -1206,7 +1210,7 @@ if [ ! -f $proto ]; then
     if [ "$ProtoType" != "skel" ]; then
         prompt "Do you want to continue using the skeletal configuration file [yes]?"
         read x
-       isOK $x || exit 1
+       isOK $x || die
        ProtoType=skel;
        proto=$MODEMCONFIG/$ProtoType;
        if [ ! -f $proto ]; then
@@ -1216,11 +1220,11 @@ Sigh, the skeletal configuration file is not available either.  There
 is nothing that I can do without some kind of prototype config file;
 I'm bailing out...
 EOF
-           exit 1
+           die
        fi
     else
        echo "There is nothing more that I can do; I'm bailing out..."
-       exit 1
+       die
     fi
 fi
 
@@ -1732,7 +1736,7 @@ else
     echo "*** The original config file is unchanged; I'm terminating before"
     echo "***    I do something stupid."
     echo ""
-    exit 1
+    die
 fi
 
 #
@@ -1748,7 +1752,7 @@ test -p $FIFO || {
     else
        echo ""
        echo "*** Unable to create fifo \"$FIFO\"; terminating."
-       exit 1
+       die
     fi
 }
 $CHOWN $FAX $FIFO; $CHGRP $faxGID $FIFO; $CHMOD 600 $FIFO
@@ -2013,7 +2017,7 @@ if [ $updateConfig = yes ]; then
        echo "*** Sorry, something went wrong building $SCHEDCONFIG.new."
        echo "*** The original config file is unchanged; check your disk space?"
        echo ""
-       exit 1
+       die
     fi
 fi
 

diff --git a/etc/faxsetup.sh.in b/etc/faxsetup.sh.in
index f443d7ad4717673190cea35ba7e29ac39445f2b0..94613af398d2cabd5b3076120f738e8f8af6f282 100644 (file)
--- a/etc/faxsetup.sh.in
+++ b/etc/faxsetup.sh.in
@@ -215,6 +215,10 @@ bitch()
 boom()
 {
     $RM $JUNK
+    # boom can be called before TMPDIR is set
+    if test x$TMPDIR != x; then
+       $RM -r $TMPDIR
+    fi
     exit 1
 }
 
@@ -2192,7 +2196,7 @@ if onServer; then
            if [ "$ok" != skip ]; then
                test -f $PROMPTS || (
                ${NOCLOBBER_ON}
-               > $PROMPTS || exit 1
+               > $PROMPTS || boom
                ${NOCLOBBER_OFF}
                compilePrompts>$PROMPTS<<EOF
 #      CountryCode             Country code