X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/063bbf05f6c593a47a8ddef095ddfb63ef2dcea5..7268fe31b1ff66a337913749eaca0b98b4860830:/.mutt/sendmail

diff --git a/.mutt/sendmail b/.mutt/sendmail
index 44e91dc..494e3d6 100755
--- 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)
-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
-args=$(for a in $@; do [ $a = -- ] || echo "--arg=$a"; done)
 run-parts --umask=0077 --arg="$TMPFILE" $args -- "$CHECKSDIR"
-$SENDMAIL -- "$@" < "$TMPFILE"
+$SENDMAIL "$sendmail_args" < "$TMPFILE"
 
 cleanup