[PATCH] notmuch-emacs-mua: non-forking escape () usage with backslash '\' escape

diff --git a/8a/06abd72ed9ce17efc0263f86e3cf22cd0735de b/8a/06abd72ed9ce17efc0263f86e3cf22cd0735de
new file mode 100644 (file)
index 0000000..3cd5dd2
--- /dev/null
+++ b/8a/06abd72ed9ce17efc0263f86e3cf22cd0735de
@@ -0,0 +1,102 @@
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id A8130431FBF\r
+       for <notmuch@notmuchmail.org>; Sun, 29 Mar 2015 09:38:02 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id O-gEmwEA-aLB for <notmuch@notmuchmail.org>;\r
+       Sun, 29 Mar 2015 09:37:59 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id CE23E431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 29 Mar 2015 09:37:58 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 8C7AB10009D; Sun, 29 Mar 2015 19:37:35 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] notmuch-emacs-mua: non-forking escape () usage with backslash\r
+       '\' escape\r
+Date: Sun, 29 Mar 2015 19:37:34 +0300\r
+Message-Id: <1427647054-7773-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 2.0.0\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 29 Mar 2015 16:38:02 -0000\r
+\r
+Use the printf -v convention to give output variable as argument\r
+to escape () function so no subshell needs to be executed for\r
+escaping input. The '-v' option to escape () is just syntactic\r
+sugar for better understanding.\r
+\r
+Also, backslash is now escaped with another backslash for emacs. This\r
+ie especially important at the end of string.\r
+\r
+`echo` is no longer used to write escaped output -- it might interpret\r
+the escapes itself.\r
+---\r
+\r
+This is first patch of the series to be continued -- next one would\r
+already collide with Jani's work so it is left for the future...\r
+\r
+ notmuch-emacs-mua | 11 ++++++-----\r
+ 1 file changed, 6 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua\r
+index 13f67be..7971430 100755\r
+--- a/notmuch-emacs-mua\r
++++ b/notmuch-emacs-mua\r
+@@ -22,9 +22,12 @@\r
+ \r
+ set -eu\r
+ \r
++# escape: "expand" '\' as '\\' and '"' as '\"'\r
++# calling convention: escape -v var "$arg" (like in bash printf).\r
+ escape ()\r
+ {\r
+-    echo "${1//\"/\\\"}"\r
++    local __escape_arg__=${3//\\/\\\\}\r
++    printf -v $2 '%s' "${__escape_arg__//\"/\\\"}"\r
+ }\r
+ \r
+ EMACS=${EMACS-emacs}\r
+@@ -72,9 +75,7 @@ while getopts :s:c:b:i:h opt; do\r
+           ;;\r
+     esac\r
+ \r
+-\r
+-    OPTARG="${OPTARG-none}"\r
+-    OPTARG="$(escape "${OPTARG}")"\r
++    escape -v OPTARG "${OPTARG-none}"\r
+ \r
+     case "${opt}" in\r
+       --help|h)\r
+@@ -117,7 +118,7 @@ done\r
+ \r
+ # Positional parameters.\r
+ for arg; do\r
+-    arg="$(escape "${arg}")"\r
++    escape -v arg "${arg}"\r
+     ELISP="${ELISP} (message-goto-to) (insert \"${arg}, \")"\r
+ done\r
+ \r
+-- \r
+2.1.0\r
+\r