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

diff --git a/.mutt/sendmail b/.mutt/sendmail
index 9efaea33df3bea5a38511f1df85f2193894ee587..494e3d6de7537df007d43cfa8284a1b945cb9e9c 100755 (executable)
--- a/.mutt/sendmail
+++ b/.mutt/sendmail
@@ -20,10 +20,18 @@ 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
-args=$(for a in $@; do case "$a" in (*@*) echo "--arg=$a";; esac; done)
 run-parts --umask=0077 --arg="$TMPFILE" $args -- "$CHECKSDIR"
-[ "$1" = -- ] && shift
-$SENDMAIL "$@" < "$TMPFILE"
+$SENDMAIL "$sendmail_args" < "$TMPFILE"
 
 cleanup

diff --git a/.mutt/sendmail-checks.d/zzz_add-spool-bcc b/.mutt/sendmail-checks.d/zzz_add-spool-bcc
index 12b1568be53f1e9a6463ea9064c70014a5c3095b..96c8e7b4ca2b594a243f9616c3432e28df173311 100755 (executable)
--- a/.mutt/sendmail-checks.d/zzz_add-spool-bcc
+++ b/.mutt/sendmail-checks.d/zzz_add-spool-bcc
@@ -10,10 +10,15 @@
 set -eu
 
 SPOOL_MAILDIR=$HOME/mail/spool
+INPUT="$1"; shift
+DEST="$SPOOL_MAILDIR/cur/${INPUT##*/}:2,S"
 
-if ! cp -n "$1" "$SPOOL_MAILDIR/cur/${1##*/}:2,S"; then
+
+if ! cp -n "$INPUT" "$DEST"; then
   echo >&1 "W: failed to spool message file '$1'."
   TMPFILE=$(tempfile -p mutt-sendmail -s .msg)
-  cat "$1" > "$TMPFILE"
   echo >&1 "W: leaving a copy in '$TMPFILE'…"
+else
+  RECIPIENTS=$(for i in "$@"; do echo " $i,"; done)
+  formail -I"X-Sendmail-Recipients:${RECIPIENTS%,}" < "$INPUT" > "$DEST"
 fi