From 7268fe31b1ff66a337913749eaca0b98b4860830 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Tue, 13 Mar 2012 14:02:59 +0100
Subject: [PATCH] enable writing of X-Sendmail-Recipients header to spooled
 files

---
 .mutt/sendmail                            | 14 +++++++++++---
 .mutt/sendmail-checks.d/zzz_add-spool-bcc |  9 +++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.mutt/sendmail b/.mutt/sendmail
index 9efaea3..494e3d6 100755
--- 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 12b1568..96c8e7b 100755
--- 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
-- 
2.39.2