X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-emacs-mua;h=79714305b3e2a0a6104b84215710004efc157fe0;hp=b8cbc822fe89103874fcb6f73c5a7b8dd6aa44c7;hb=5a3b42fb8c556397841b86c5fda1c4554dab253a;hpb=f4a5a534c8312bc46b7c561d5f4d26600a532d96

diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
index b8cbc822..79714305 100755
--- a/notmuch-emacs-mua
+++ b/notmuch-emacs-mua
@@ -22,9 +22,12 @@
 
 set -eu
 
+# escape: "expand" '\' as '\\' and '"' as '\"'
+# calling convention: escape -v var "$arg" (like in bash printf).
 escape ()
 {
-    echo "${1//\"/\\\"}"
+    local __escape_arg__=${3//\\/\\\\}
+    printf -v $2 '%s' "${__escape_arg__//\"/\\\"}"
 }
 
 EMACS=${EMACS-emacs}
@@ -38,7 +41,8 @@ CLIENT_TYPE="-c"
 ELISP="(prog1 'done (require 'notmuch) (notmuch-mua-new-mail)"
 ELISP="${ELISP} (setq message-exit-actions (list #'save-buffers-kill-terminal))"
 
-while getopts :s:c:b:i:hC opt; do
+# Short options compatible with mutt(1).
+while getopts :s:c:b:i:h opt; do
     # Handle errors and long options.
     case "${opt}" in
 	:)
@@ -71,15 +75,13 @@ while getopts :s:c:b:i:hC opt; do
 	    ;;
     esac
 
-
-    OPTARG="${OPTARG-none}"
-    OPTARG="$(escape "${OPTARG}")"
+    escape -v OPTARG "${OPTARG-none}"
 
     case "${opt}" in
 	--help|h)
 	    exec man notmuch-emacs-mua
 	    ;;
-	--client|C)
+	--client)
 	    USE_EMACSCLIENT="yes"
 	    ;;
 	--subject|s)
@@ -116,7 +118,7 @@ done
 
 # Positional parameters.
 for arg; do
-    arg="$(escape "${arg}")"
+    escape -v arg "${arg}"
     ELISP="${ELISP} (message-goto-to) (insert \"${arg}, \")"
 done