exit on error in any sendmail check

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

diff --git a/.mutt/sendmail b/.mutt/sendmail
index e002a5e0090d543b3397af1145ea22f629e417c1..635ff3e596d945fe73acb2574af703f799b62e77 100755 (executable)
--- a/.mutt/sendmail
+++ b/.mutt/sendmail
@@ -20,10 +20,20 @@ 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
+recipients= sendmail_args=
+for i in "$@"; do
+  case "$argtype/$i" in
+    (s/--) argtype=r;;
+    (s/*) sendmail_args="${sendmail_args} $i";;
+    (r/*) recipients="${recipients} $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"
+recipients="$recipients $(formail -czx X-Bcc-Spool: < "$TMPFILE" | tr -d ',')"
+args=$(for i in $recipients; do echo "--arg=$i"; done)
+run-parts --exit-on-error --umask=0077 --arg="$TMPFILE" $args -- "$CHECKSDIR"
+formail -I X-Bcc-Spool: < "$TMPFILE" | eval $SENDMAIL "$sendmail_args" -- "$recipients"
 
 cleanup