X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/461a262aea47dd6bcc6f590247857cabb5bf407c..7ee3d9bac7902c2dd763dc7acf1a1113c2f2f0d6:/muttjump

diff --git a/muttjump b/muttjump
index 28fb3a7..38e8a02 100755
--- a/muttjump
+++ b/muttjump
@@ -63,10 +63,18 @@ function quote () {
     echo \'${1//\'/\'\\\'\'}\'
 }
 
+function quote_regexp () {
+    echo "$1" | sed 's/[][\^.$|)(*+?}{]/\\&/g'
+}
+
 function is_callable () {
     type $1 >/dev/null 2>&1
 }
 
+function wc_L () {
+    awk '{ y = length(); if (y > x) x = y } END { print x }'
+}
+
 function usage () {
     cat >&2 <<END
 Usage: muttjump msgid
@@ -136,12 +144,19 @@ fi
 if [ -z "$msgid" ] ; then
     die "could not find $search_header header in standard input"
 fi
+msgid_quoted=$(quote_regexp "$msgid")
 msgid_clean=$(echo "$msgid" | sed -e 's/^<//' -e 's/>$//')
 
 # try to locate path of message using a mail search engine
 case $MUTTJUMP_INDEXER in
     mairix)
-        orig_msgfiles=$($MAIRIX -r "m:$msgid_clean")
+        # mairix can't quote special characters (~,/=^) in search words. As a
+        # workaround, split Message-ID in 31-character long AND-linked
+        # substrings.
+        msgid_mairix=$(echo "$msgid_clean" | sed -e 's/[~,/=^]\+/ /g' \
+            -e 's/[^ ]\{31\}/& /g' -e 's/^ \+//g' -e 's/ \+$/=/g' \
+            -e 's/ /=,/g')
+        orig_msgfiles=$($MAIRIX -r "m:$msgid_mairix")
         ;;
     mu)
         orig_msgfiles=$($MU find -f l "i:$msgid_clean" | grep -v "^\*\*")
@@ -151,7 +166,7 @@ case $MUTTJUMP_INDEXER in
         ;;
     nmzmail)
         nmzmail_results=$(mktemp -d)
-        echo "+message-id:$msgid" | $NMZMAIL -r "$nmzmail_results"
+        echo "+message-id:/^$msgid_quoted$/" | $NMZMAIL -r "$nmzmail_results"
         orig_msgfiles=$(find "$nmzmail_results" -type l -exec readlink {} \;)
         rm -rf "$nmzmail_results"
         ;;
@@ -170,25 +185,24 @@ fi
 count=$(echo "$orig_msgfiles" | wc -l)
 if [ $count -gt 1 -a -n "$DIALOG_PROG" ] ; then
     choices=$(echo "$orig_msgfiles" | while read line ;
-        do echo -e "$(dirname "$(dirname "$line")")\n." ; done)
-    maxwidth=$(echo "$choices" | wc -L)
+        do dirname "$(dirname "$line")" ; echo . ; done)
+    maxwidth=$(echo "$choices" | wc_L)
     orig_maildir=$($DIALOG_PROG --clear --title "More than one mailbox found" \
         --menu "Select mailbox:" $((count+8)) $((maxwidth+16)) \
         $count $choices 3>&2 2>&1 1>&3-)
 elif [ $count -gt 1 ] ; then
-    dirs=()
-    for f in $orig_msgfiles ; do
-        dirs=(${dirs[@]} "$(dirname "$(dirname "$f")")")
-    done
+    choices=()
+    while read line ; do
+        choices=("${choices[@]}" "$(dirname "$(dirname "$line")")")
+    done <<<"$orig_msgfiles"
     echo "More than one mailbox found"
     echo "Select mailbox:"
-    select md in ${dirs[@]} ; do
-        orig_maildir="$md"
-        orig_msgfile="${orig_msgfiles[$REPLY]}"
+    select md in "${choices[@]}" ; do
+        orig_maildir=$md
         break
     done <> /dev/tty
 else
-    orig_msgfile="$orig_msgfiles"
+    orig_msgfile=$orig_msgfiles
     # get containing maildir of $orig_msgfile
     orig_maildir=$(dirname "$(dirname "$orig_msgfile")")
 fi
@@ -197,7 +211,8 @@ if [ ! -d "$orig_maildir/cur" ] ; then
     die "directory $(quote "$orig_maildir") doesn't exist or is no Maildir"
 fi
 
-jump_expr="~i'$msgid'"
+msgid_mutt=$(quote_regexp "$msgid_quoted")
+jump_expr="~i'$msgid_mutt'"
 
 if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then