enable writing of X-Sendmail-Recipients header to spooled files

[etc/mutt.git] / .mutt / sendmail

diff --git a/.mutt/sendmail b/.mutt/sendmail
index 44e91dc3241eee8d48358efed7b2cebd8f655cc5..494e3d6de7537df007d43cfa8284a1b945cb9e9c 100755 (executable)
--- a/.mutt/sendmail
+++ b/.mutt/sendmail
@@ -16,12 +16,22 @@ CHECKSDIR="$HOME/.mutt/sendmail-checks.d"
 SENDMAIL="/usr/sbin/sendmail -oem -oi"
 
 TMPFILE=$(tempfile -p mutt-sendmail -s .msg)
 SENDMAIL="/usr/sbin/sendmail -oem -oi"
 
 TMPFILE=$(tempfile -p mutt-sendmail -s .msg)

-cleanup () { rm -f "$TMPFILE"; trap - 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15; }
-trap cleanup 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+settrap () { trap "$@" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15; }
+cleanup () { rm -f "$TMPFILE"; settrap -; }
+settrap cleanup
+
+argtype=s
+args= sendmail_args=
+for i in "$@"; do
+  case "$argtype/$i" in
+    (s/--) argtype=r;;
+    (s/*) sendmail_args="${sendmail_args} $i";;
+    (r/*) args="${args} --arg=$i";;
+  esac
+done

 
 cat > $TMPFILE
 
 cat > $TMPFILE

-args=$(for a in $@; do [ $a = -- ] || echo "--arg=$a"; done)

 run-parts --umask=0077 --arg="$TMPFILE" $args -- "$CHECKSDIR"
 run-parts --umask=0077 --arg="$TMPFILE" $args -- "$CHECKSDIR"

-$SENDMAIL -- "$@" < "$TMPFILE"
+$SENDMAIL "$sendmail_args" < "$TMPFILE"

 
 cleanup
 
 cleanup