# (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:
-# * add support for undocumented -resent compiled mhmail switch
+# * add -header-field name:body switch
# * add -attach file ... switch
usage='Usage: mhmail [addrs ... [switches]]
-b(ody) text
-c(c) addrs ...
-f(rom) addr
- -s(ubject) text
+ -su(bject) text
+ -r(esent)
-pr(ofile)
+ -se(nd)
+ -nose(nd)
-v(ersion)
-h(elp)
- -d(ebug)
and all post(8)/send(1) switches'
bindir=`dirname $0`
fromarg=0
subject=
subjectarg=0
+ resent=0
postsendargs=
switcharg=0
use_send=0
- debug=
+ sendsw=1
for arg in "$@"; do
case "${arg}" in
-*) switcharg=0
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 ;;
- -d|-de|-deb|-debu|-debug) debug=echo ;;
-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 ;;
- -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 ;;
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
#### 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
#### 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=${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.
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
- fi
- if [ "${debug}" ]; then
- printf "%s:\n" `ls -1 "${tmpfil}"`
- cat "${tmpfil}"
+ 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 [ "$use_send" -eq 0 ]; then
- post_or_send=`${nmhbindir}/mhparam postproc`
+ if [ ${sendsw} -eq 0 ]; then
+ cat "${tmpfile}"
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}" "${tmpfile}" ${postsendargs}; then
+ exit
+ else
+ printf "Letter saved in dead.letter\n"
+ #### exec skips the trap set above.
+ exec mv "${tmpfile}" dead.letter
+ fi
fi
fi
projects / mmh / blobdiff