Replaced mhmail -debug switch with -nosend, and added -send.

[nmh] / uip / mhmail

diff --git a/uip/mhmail b/uip/mhmail
index de2fe4d2d77e4c493f2a413e528dfcea90e0e438..3727ce0da6fb8d458e7874714da9d93bf0e13806 100755 (executable)
--- a/uip/mhmail
+++ b/uip/mhmail
@@ -14,11 +14,12 @@
 #   (with -profile) options.
 # * Optionally (with -profile) obeys the users profile, including
 #   AliasFile and send entries.
 #   (with -profile) options.
 # * Optionally (with -profile) obeys the users profile, including
 #   AliasFile and send entries.

-# * Adds -debug option for debugging (sending, not incorporating new mail).
+# * Adds -nosend option, which displays the draft but does not send it.

 # * Drops support for undocumented -queue option.
 #
 # To do:
 # * Drops support for undocumented -queue option.
 #
 # To do:

-# * add support for undocumented -resent compiled mhmail switch
+# * fix -resent with -profile
+# * add -header-field name:body switch

 # * add -attach file ... switch
 
 usage='Usage: mhmail [addrs ... [switches]]
 # * add -attach file ... switch
 
 usage='Usage: mhmail [addrs ... [switches]]


@@ -26,11 +27,13 @@ usage='Usage: mhmail [addrs ... [switches]]
   -b(ody) text
   -c(c) addrs ...
   -f(rom) addr
   -b(ody) text
   -c(c) addrs ...
   -f(rom) addr

-  -s(ubject) text
+  -su(bject) text
+  -r(esent)

   -pr(ofile)
   -pr(ofile)

+  -se(nd)
+  -nose(nd)

   -v(ersion)
   -h(elp)
   -v(ersion)
   -h(elp)

-  -d(ebug)

   and all post(8)/send(1) switches'
 
 bindir=`dirname $0`
   and all post(8)/send(1) switches'
 
 bindir=`dirname $0`


@@ -50,10 +53,11 @@ else
   fromarg=0
   subject=
   subjectarg=0
   fromarg=0
   subject=
   subjectarg=0

+  resent=0

   postsendargs=
   switcharg=0
   use_send=0
   postsendargs=
   switcharg=0
   use_send=0

-  debug=
+  sendsw=1

   for arg in "$@"; do
     case "${arg}" in
       -*) switcharg=0
   for arg in "$@"; do
     case "${arg}" in
       -*) switcharg=0


@@ -62,16 +66,20 @@ else
     case "${arg}" in
       #### Post and send won't accept -f -or -s because they'd be
       #### ambiguous, so no conflicts with them.  And they don't have
     case "${arg}" in
       #### Post and send won't accept -f -or -s because they'd be
       #### ambiguous, so no conflicts with them.  And they don't have

-      #### -b or -c.  For the new switches that compiled mhmail didn't
-      #### have:  let -p indicate mhmail -profile, not send -port, and
-      #### let -d indicate mhmail -debug, not send -draft.
+      #### -b, -c, or -r.  For the new switches that compiled mhmail
+      #### didn't have:  let -p indicate mhmail -profile, not send
+      #### -port.  -send masks the send(1) -send switch.

       -b|-bo|-bod|-body) bodyarg=1 ;;
       -c|-cc) ccarg=1 ;;
       -b|-bo|-bod|-body) bodyarg=1 ;;
       -c|-cc) ccarg=1 ;;

-      -d|-de|-deb|-debu|-debug) debug=echo ;;

       -f|-fr|-fro|-from) fromarg=1 ;;
       -h|-he|-hel|-help) printf "%s\n" "${usage}"; exit ;;
       -f|-fr|-fro|-from) fromarg=1 ;;
       -h|-he|-hel|-help) printf "%s\n" "${usage}"; exit ;;

+      -nose|-nosen|-nosend) sendsw=0 ;;

       -p|-pr|-pro|-prof|-profi|-profil|-profile) use_send=1 ;;
       -p|-pr|-pro|-prof|-profi|-profil|-profile) use_send=1 ;;

-      -s|-su|-sub|-subj|-subje|-subjec|-subject) subjectarg=1 ;;
+      -resend) printf "mhmail: did you mean -resent instead of -resend?\n" 1>&2
+         exit 1 ;;
+      -r|-re|-res|-rese|-resen|-resent) resent=1 ;;
+      -se|-sen|-send) sendsw=1 ;;
+      -su|-sub|-subj|-subje|-subjec|-subject) subjectarg=1 ;;

       -v|-ve|-ver|-vers|-versi|-versio|-version)
          #### Cheat instead of using autoconf and make to fill in the version.
          "${nmhbindir}"/mhpath -v | sed 's/mhpath/mhmail/'; exit ;;
       -v|-ve|-ver|-vers|-versi|-versio|-version)
          #### Cheat instead of using autoconf and make to fill in the version.
          "${nmhbindir}"/mhpath -v | sed 's/mhpath/mhmail/'; exit ;;


@@ -111,16 +119,15 @@ else
   fi
 
   #### Build header.
   fi
 
   #### Build header.

-  header="To: ${tolist}
+  [ ${resent} -eq 0 ]  &&  prefix=  ||  prefix='Resent-'
+  header="${prefix}To: ${tolist}

 "
 "

-  [ "${cclist}"x = x ]  ||  header="${header}Cc: ${cclist}
+  [ "${cclist}"x = x ]  ||  header="${header}${prefix}Cc: ${cclist}

 "
 "

-  [ "${subject}"x = x ]  ||  header="${header}Subject: ${subject}
+  [ "${subject}"x = x ]  ||  header="${header}${prefix}Subject: ${subject}

 ";
 ";

-  [ "${from}"x = x ]  ||  header="${header}From: ${from}
+  [ "${from}"x = x ]  ||  header="${header}${prefix}From: ${from}

 ";
 ";

-  header="${header}
-"

 
   #### Set up a file to supply as a draft to send/post.  And set a
   #### trap to remove it.  send moves the file to a backup, so it will
 
   #### Set up a file to supply as a draft to send/post.  And set a
   #### trap to remove it.  send moves the file to a backup, so it will


@@ -131,6 +138,22 @@ else
   tmpfilbackup="${tmpdir}/[,#]mhmail$$"
   trap 'rm -f '"${tmpfil}"' '"${tmpfilbackup}" EXIT
 
   tmpfilbackup="${tmpdir}/[,#]mhmail$$"
   trap 'rm -f '"${tmpfil}"' '"${tmpfilbackup}" EXIT
 

+  if [ ${resent} -eq 0 ]; then
+    #### Add blank line after header if not resending.
+    header="${header}
+"
+  else
+    if [ ${use_send} -eq 0 ]; then
+      postsendargs="${postsendargs:+${postsendargs} }-dist"
+    else
+      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
+    fi
+  fi
+

   if [ "${body}"x = x ]; then
     #### First put message header in the file.  cat >> handles blank
     #### lines better than body=`cat`.
   if [ "${body}"x = x ]; then
     #### First put message header in the file.  cat >> handles blank
     #### lines better than body=`cat`.


@@ -156,22 +179,21 @@ else
     printf "%s" "${header}${body}" > "${tmpfil}" || exit 1
   fi
 
     printf "%s" "${header}${body}" > "${tmpfil}" || exit 1
   fi
 

-  if [ "${debug}" ]; then
-    printf "%s:\n" `ls -1 "${tmpfil}"`
+  if [ ${sendsw} -eq 0 ]; then

     cat "${tmpfil}"
     cat "${tmpfil}"

-  fi
-
-  if [ "$use_send" -eq 0 ]; then
-    post_or_send=`${nmhbindir}/mhparam postproc`

   else
   else

-    post_or_send="${nmhbindir}/send"
-  fi
+    if [ ${use_send} -eq 0 ]; then
+      post_or_send=`${nmhbindir}/mhparam postproc`
+    else
+      post_or_send="${nmhbindir}/send"
+    fi

 
 

-  if $debug "${post_or_send}" "${tmpfil}" ${postsendargs}; then
-    :
-  else
-    printf "Letter saved in dead.letter\n"
-    #### exec skips the trap set above.
-    exec mv "${tmpfil}" dead.letter
+    if "${post_or_send}" "${tmpfil}" ${postsendargs}; then
+      exit
+    else
+      printf "Letter saved in dead.letter\n"
+      #### exec skips the trap set above.
+      exec mv "${tmpfil}" dead.letter
+    fi

   fi
 fi
   fi
 fi