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

diff --git a/.mutt/sendmail b/.mutt/sendmail
index 44e91dc..9efaea3 100755
--- a/.mutt/sendmail
+++ b/.mutt/sendmail
@@ -16,12 +16,14 @@ 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
 
 cat > $TMPFILE
-args=$(for a in $@; do [ $a = -- ] || echo "--arg=$a"; done)
+args=$(for a in $@; do case "$a" in (*@*) echo "--arg=$a";; esac; done)
 run-parts --umask=0077 --arg="$TMPFILE" $args -- "$CHECKSDIR"
-$SENDMAIL -- "$@" < "$TMPFILE"
+[ "$1" = -- ] && shift
+$SENDMAIL "$@" < "$TMPFILE"
 
 cleanup