X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0d33f1e27c4edb7290ef51cd03d50c0dbc9059ef..4548a3ecc4248a1d4bd4fdd45d9a2bb1e61d1e70:/uip/mhmail

diff --git a/uip/mhmail b/uip/mhmail
index afe633f8..2fbedccb 100755
--- a/uip/mhmail
+++ b/uip/mhmail
@@ -210,7 +210,7 @@ fi
 umask 077
 tmpdir="${MHTMPDIR:-${TMPDIR:-${TMP:-`$nmhbindir/mhpath +`}}}"
 tmpfile="$tmpdir/mhmail$$"
-tmpfilebackup="$tmpdir/[,#]mhmail$$"
+tmpfilebackup="'$tmpdir'/,mhmail$$ '$tmpdir'/#mhmail$$"
 tmpfileresent=
 
 message_file=
@@ -235,7 +235,7 @@ else
   fi
 fi
 
-trap 'rm -f '"$tmpfile"' '"$tmpfilebackup"' '"$tmpfileresent" EXIT
+trap "rm -f '$tmpfile' $tmpfilebackup ${tmpfileresent:+'$tmpfileresent'}" 0
 
 if [ "$body"x = x ]; then
   #### First put message header in the file.