slightly better mairix quoting (3)

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index 53a44bbe63e9bab6054c6976f2a10228eb134db1..9cb34b1fcee95786fe56a1554dc4e5a350609598 100755 (executable)
--- 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
@@ -145,9 +153,9 @@ case $MUTTJUMP_INDEXER in
         # 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/$/=/' \
-            -e 's/\(=,\|=\)\+$/=/g')
+        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)
@@ -158,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"
         ;;
@@ -178,7 +186,7 @@ count=$(echo "$orig_msgfiles" | wc -l)
 if [ $count -gt 1 -a -n "$DIALOG_PROG" ] ; then
     choices=$(echo "$orig_msgfiles" | while read line ;
         do dirname "$(dirname "$line")" ; echo . ; done)
-    maxwidth=$(echo "$choices" | wc -L)
+    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-)
@@ -203,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