X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhmail;h=bcb9bd3caf50d26d410f9ba6589f7cca4ef0d58b;hb=d4850ff231bec8513dcd106bdb93bc61d179d8f6;hp=6e03f15c8a42f59d5a131115f23f9e7363221fc3;hpb=8d45f4718da3b8a57208f72fc58d17383a8f8012;p=mmh

diff --git a/uip/mhmail b/uip/mhmail
index 6e03f15..bcb9bd3 100755
--- a/uip/mhmail
+++ b/uip/mhmail
@@ -7,32 +7,30 @@
 # complete copyright information.
 #
 # Emulation of compiled mhmail(1), with these differences:
-# * Instead of silently not sending an empty message, notifies user
-#   "mhmail: empty message not sent, use -body '' to force."
-# * The compiled mhmail dropped a trailing newline from the -body argument.
+# * Adds -send/-nosend, -header-field, and -attach options.
 # * Supports all post(8) (by default, without -profile) or send(1)
 #   (with -profile) options.
 # * Optionally (with -profile) obeys the users profile, including
 #   AliasFile and send entries.
-# * Adds -nosend option, which displays the draft but does not send it.
+# * Instead of silently not sending an empty message, notifies user
+#   "mhmail: empty message not sent, use -body '' to force."
+# * The compiled mhmail dropped a trailing newline from the -body argument.
 # * Drops support for undocumented -queue option.
-#
-# To do:
-# * add -header-field name:body switch
-# * add -attach file ... switch
 
 usage='Usage: mhmail [addrs ... [switches]]
   switches are:
+  -at(tach) file [-at(tach) file] ...
   -b(ody) text
   -c(c) addrs ...
   -f(rom) addr
+  -hea(der-field) name:field [-hea(der-field) name:field] ...
   -su(bject) text
   -r(esent)
   -pr(ofile)
   -se(nd)
   -nose(nd)
   -v(ersion)
-  -h(elp)
+  -hel(p)
   and all post(8)/send(1) switches'
 
 bindir=`dirname $0`
@@ -44,12 +42,16 @@ if [ $# -eq 0 ]; then
 else
   #### Go through all the switches so we can build the draft.
   tolist=
+  attacharg=0
+  attach_send_switch_added=0
   body=
   bodyarg=0
   cclist=
   ccarg=0
   from=
   fromarg=0
+  headerfieldlist=
+  headerfieldarg=0
   subject=
   subjectarg=0
   resent=0
@@ -59,7 +61,7 @@ else
   sendsw=1
   for arg in "$@"; do
     case "${arg}" in
-      -*) switcharg=0
+      -*) switcharg=0; headerfieldarg=0 ;;
     esac
 
     case "${arg}" in
@@ -67,11 +69,23 @@ else
       #### ambiguous, so no conflicts with them.  And they don't have
       #### -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.
+      #### -port.  -send masks the send(1) -send switch.  -attach
+      #### masks the send(1) -attach switch.
+      -at|-att|-atta|-attac|-attach)
+         attacharg=1;
+         use_send=1
+         if [ ${attach_send_switch_added} -eq 0 ]; then
+           #### Override any send -attach switch in user's profile.
+           postsendargs=\
+"${postsendargs:+${postsendargs} }-attach Nmh-Attachment"
+           attach_send_switch_added=1
+         fi
+         ;;
       -b|-bo|-bod|-body) bodyarg=1 ;;
       -c|-cc) ccarg=1 ;;
       -f|-fr|-fro|-from) fromarg=1 ;;
-      -h|-he|-hel|-help) printf "%s\n" "${usage}"; exit ;;
+      -hea|-head|-heade|-header|-header-|-header-f|-header-fi|-header-fie|-header-fiel|-header-field) headerfieldarg=1 ;;
+      -hel|-help) printf "%s\n" "${usage}"; exit ;;
       -nose|-nosen|-nosend) sendsw=0 ;;
       -p|-pr|-pro|-prof|-profi|-profil|-profile) use_send=1 ;;
       -resend) printf "mhmail: did you mean -resent instead of -resend?\n" 1>&2
@@ -85,14 +99,30 @@ else
       -*) postsendargs="${postsendargs:+${postsendargs} }${arg}"; switcharg=1 ;;
       *) if [ ${bodyarg} -eq 1 ]; then
            body="${arg}
-"; bodyarg=0
+"
+           bodyarg=0
            #### Allow -body "" by using just a newline for the body.
            [ "${body}"x = x ]  &&  body='
 '
          elif [ ${fromarg} -eq 1 ]; then
-           from="${arg}"; fromarg=0
+           from="${arg}"
+           fromarg=0
          elif [ ${subjectarg} -eq 1 ]; then
-           subject="${arg}"; subjectarg=0
+           subject="${arg}"
+           subjectarg=0
+         elif [ ${attacharg} -eq 1 ]; then
+           headerfieldlist="${headerfieldlist:+${headerfieldlist}}\
+Nmh-Attachment: ${arg}
+"
+           attacharg=0
+         elif [ ${headerfieldarg} -eq 1 ]; then
+           #### It's not strictly necessary to have one space after
+           #### the : that separates the header field name from the
+           #### body, but do it to avoid surprising someone.
+           add=`printf "${arg}" | sed -e 's/:/: /' -e 's/:  /: /'`
+           headerfieldlist="${headerfieldlist:+${headerfieldlist}}${add}
+"
+           headerfieldarg=0
          elif [ ${switcharg} -eq 1 ]; then
            postsendargs="${postsendargs:+${postsendargs} }${arg}"
          elif [ ${ccarg} -eq 1 ]; then
@@ -101,7 +131,7 @@ else
          else
            #### An address.
            tolist="${tolist:+${tolist}, }${arg}"
-         fi
+         fi ;;
     esac
   done
 
@@ -126,6 +156,10 @@ else
   [ "${from}"x = x ]  ||  header="${header}${prefix}From: ${from}
 ";
 
+  if [ "${headerfieldlist}" ]; then
+    header="${header}${headerfieldlist}";
+  fi
+
   #### 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
   #### remove that, too.