X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/220e7295f53434bca273cb9a516da29bdb0dd5bb..898fab5994b1bf77eff72962aada243b7abc647c:/muttjump

diff --git a/muttjump b/muttjump
index 0a45d1d..d32a8ae 100755
--- a/muttjump
+++ b/muttjump
@@ -46,12 +46,18 @@ MAIRIX=${MAIRIX:-mairix}
 MU=${MU:-mu}
 NMZMAIL=${NMZMAIL:-nmzmail}
 SCREEN=${SCREEN:-screen}
+FORMAIL=${FORMAIL:-formail}
+REFORMAIL=${REFORMAIL:-reformail}
 
 function die () {
     echo -e >&2 "$0: $1"
     exit 1
 }
 
+function quote () {
+    echo \'${1//\'/\'\\\'\'}\'
+}
+
 # Check command-line arguments and STDIN
 if tty -s || [ $# -ne 0 ] ; then
     cat >&2 <<END
@@ -69,8 +75,22 @@ if ! type -p $MUTT >/dev/null ; then
     die "$MUTT is not in PATH, set MUTT variable"
 fi
 
+case $MUTTJUMP_MODE in
+    limit|search)
+        ;;
+    *)
+        die "variable MUTTJUMP_MODE must be set to \"limit\" or \"search\""
+        ;;
+esac
+
 # search for Message-ID in STDIN
-msgid=$(sed -n 's/^Message-ID: \(.*\)/\1/Ip' | head -n1)
+if type -p $FORMAIL >/dev/null ; then
+    msgid=$($FORMAIL -c -z -x Message-ID | head -n1)
+elif type -p $REFORMAIL >/dev/null ; then
+    msgid=$($REFORMAIL -c -x Message-ID: | head -n1)
+else
+    msgid=$(sed -n 's/^Message-ID: \(.*\)/\1/Ip' | head -n1)
+fi
 if [ -z "$msgid" ] ; then
     die "could not find Message-ID header in standard input"
 fi
@@ -110,7 +130,7 @@ fi
 # get containing maildir of $orig_msgfile
 orig_maildir=$(dirname $(dirname "$orig_msgfile"))
 if [ ! -d "$orig_maildir/cur" ] ; then
-    die "directory \"$orig_maildir\" doesn't exist or is no Maildir"
+    die "directory $(quote $orig_maildir) doesn't exist or is no Maildir"
 fi
 
 jump_cmd="<change-folder>$orig_maildir<enter><$MUTTJUMP_MODE>~i '$msgid'<enter>"
@@ -130,15 +150,16 @@ if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
 else
 
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
-    screen_opts=""
+    declare -a screen_opts
     if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then
-        screen_opts="-S $MUTTJUMP_SCREEN_SESSION"
+        screen_opts=("-S" "$MUTTJUMP_SCREEN_SESSION")
+        screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"
     fi
 
-    $SCREEN $screen_opts -X eval "select $screen_window_name" "stuff \":push \\\"$jump_cmd\\\"
+    $SCREEN "${screen_opts[@]}" -X eval "select \"$screen_window_name\"" "stuff \":push \\\"$jump_cmd\\\"
 \""
     if [ $? != 0 ] ; then
         die "You have to manually start a screen session with:
-$SCREEN $screen_opts -t $screen_window_name $MUTT -f \"$orig_maildir\""
+$SCREEN $screen_opts_str -t $(quote "$screen_window_name") $MUTT -f $(quote "$orig_maildir")"
     fi
 fi