X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhmail;h=7353e9a19977b6ef0796869dc7ef2acc1c0deffc;hb=bb8db313c1deea588b83a44a86e653d3cfcac9c1;hp=afe633f842c9edaf92d69ce480ca5eac8a4a3905;hpb=0d33f1e27c4edb7290ef51cd03d50c0dbc9059ef;p=mmh

diff --git a/uip/mhmail b/uip/mhmail
index afe633f..7353e9a 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$$"
 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.