X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhmail;h=31a21d436e4792229e4a14eaf159bec685d90eb7;hb=ebee927145cb7593ea681b21024eff7e9583b062;hp=3727ce0da6fb8d458e7874714da9d93bf0e13806;hpb=d69599edcb7a6248dfa00727cf349af59b34bdb4;p=mmh

diff --git a/uip/mhmail b/uip/mhmail
index 3727ce0..31a21d4 100755
--- a/uip/mhmail
+++ b/uip/mhmail
@@ -18,7 +18,6 @@
 # * Drops support for undocumented -queue option.
 #
 # To do:
-# * fix -resent with -profile
 # * add -header-field name:body switch
 # * add -attach file ... switch
 
@@ -113,8 +112,6 @@ else
   fi
   if [ "${from}"x = x ]; then
     nmhlibdir=`${nmhbindir}/mhparam libdir`/
-    #### If nmhlibdir isn't right, assume that the nmh lib dir is on the PATH.
-    [ -x "${nmhlibdir}ap" ]  ||  nmhlibdir=
     from=`${nmhlibdir}ap -format '%(localmbox)' 0`
   fi
 
@@ -134,35 +131,43 @@ else
   #### remove that, too.
   umask 077
   tmpdir="${MHTMPDIR:-${TMPDIR:-${TMP:-`${nmhbindir}/mhpath +`}}}"
-  tmpfil="${tmpdir}/mhmail$$"
-  tmpfilbackup="${tmpdir}/[,#]mhmail$$"
-  trap 'rm -f '"${tmpfil}"' '"${tmpfilbackup}" EXIT
+  tmpfile="${tmpdir}/mhmail$$"
+  tmpfilebackup="${tmpdir}/[,#]mhmail$$"
+  tmpfileresent=
 
+  message_file=
   if [ ${resent} -eq 0 ]; then
     #### Add blank line after header if not resending.
     header="${header}
 "
+    message_file="${tmpfile}"
   else
     if [ ${use_send} -eq 0 ]; then
       postsendargs="${postsendargs:+${postsendargs} }-dist"
+      message_file="${tmpfile}"
     else
+      #### When resending with send, tmpfile will just contain the
+      #### Resent- header fields.  "${tmpfileresent}" will contain
+      #### the message that is being resent.
+      tmpfileresent="${tmpdir}/mhmail-resent$$"
       mhdist=1; export mhdist
-      mhaltmsg=${tmpfil}; export mhaltmsg
-      #### This doesn't work, I'm not sure about mhaltmsg.
-      printf "mhmail: -resent not currently supported with -profile\n"
-      exit 1
+      mhaltmsg=${tmpfileresent}; export mhaltmsg
+      message_file="${tmpfileresent}"
+      printf "" >"${message_file}"  || exit 2
     fi
   fi
 
+  trap 'rm -f '"${tmpfile}"' '"${tmpfilebackup}"' '"${tmpfileresent}" EXIT
+
   if [ "${body}"x = x ]; then
-    #### First put message header in the file.  cat >> handles blank
-    #### lines better than body=`cat`.
-    printf "%s" "${header}" > "${tmpfil}" || exit 1
+    #### First put message header in the file.
+    printf "%s" "${header}" >"${tmpfile}" || exit 2
 
-    tmpfile_size_before=`wc -c "${tmpfil}"`
-    #### Now grab the body from stdin.
-    cat >>"${tmpfil}"
-    tmpfile_size_after=`wc -c "${tmpfil}"`
+    tmpfile_size_before=`wc -c "${message_file}"`
+    #### Now grab the body from stdin.  cat >> handles blank lines
+    #### better than body=`cat`.
+    cat >>"${message_file}" || exit 2
+    tmpfile_size_after=`wc -c "${message_file}"`
 
     #### Don't allow an empty body (from stdin).  Use string
     #### comparison so we don't have to strip the filename, etc.
@@ -172,15 +177,27 @@ else
     fi
 
     #### Add trailing newline to body if it doesn't have one.
+    if [ `tail -n 1 "${message_file}" | wc -l` -ne 1 ]; then
+      printf "\n" >>"${message_file}" || exit 2
+    fi
+  else
+    #### Add trailing newline to body if it doesn't have one.
     [ `printf "${body}" | tail -n 1 | wc -l` -ne 1 ]  &&  body="${body}
 "
-  else
-    #### Put message header and body in the file.
-    printf "%s" "${header}${body}" > "${tmpfil}" || exit 1
+
+    if [ "${tmpfileresent}" ]; then
+      #### Put just the new message header in the file.
+      printf "%s" "${header}" >"${tmpfile}" || exit 2
+      #### and the body in the file to resend.
+      printf "${body}" >"${tmpfileresent}" || exit 2
+    else
+      #### Put message header and body in the file.
+      printf "%s" "${header}${body}" >"${tmpfile}" || exit 2
+    fi
   fi
 
   if [ ${sendsw} -eq 0 ]; then
-    cat "${tmpfil}"
+    cat "${tmpfile}"
   else
     if [ ${use_send} -eq 0 ]; then
       post_or_send=`${nmhbindir}/mhparam postproc`
@@ -188,12 +205,12 @@ else
       post_or_send="${nmhbindir}/send"
     fi
 
-    if "${post_or_send}" "${tmpfil}" ${postsendargs}; then
+    if "${post_or_send}" "${tmpfile}" ${postsendargs}; then
       exit
     else
       printf "Letter saved in dead.letter\n"
       #### exec skips the trap set above.
-      exec mv "${tmpfil}" dead.letter
+      exec mv "${tmpfile}" dead.letter
     fi
   fi
 fi