Re: [PATCH v2 2/5] util: Function to parse boolean term queries

diff --git a/b7/e414dd1a232d7d64c2df8c1d15ae07b1b4671a b/b7/e414dd1a232d7d64c2df8c1d15ae07b1b4671a
new file mode 100644 (file)
index 0000000..ea10862
--- /dev/null
+++ b/b7/e414dd1a232d7d64c2df8c1d15ae07b1b4671a
@@ -0,0 +1,90 @@
+Return-Path: <bremner@unb.ca>\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 4C08B431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 26 Dec 2012 06:31:11 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 yOsMGDjee3T5 for <notmuch@notmuchmail.org>;\r
+       Wed, 26 Dec 2012 06:31:10 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id DAF5A431FAE\r
+       for <notmuch@notmuchmail.org>; Wed, 26 Dec 2012 06:31:10 -0800 (PST)\r
+Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.82.78] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@unb.ca>)\r
+       id 1Tns0g-0002Tq-WC; Wed, 26 Dec 2012 10:31:07 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@unb.ca>)\r
+       id 1Tns0b-0005y1-Bg; Wed, 26 Dec 2012 10:31:01 -0400\r
+From: David Bremner <david@tethera.net>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2 2/5] util: Function to parse boolean term queries\r
+In-Reply-To: <1356493723-11085-3-git-send-email-amdragon@mit.edu>\r
+References: <1356493723-11085-1-git-send-email-amdragon@mit.edu>\r
+       <1356493723-11085-3-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.14+213~g4af1ac6 (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Wed, 26 Dec 2012 10:31:01 -0400\r
+Message-ID: <87ip7oril6.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-Spam_bar: -\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: Wed, 26 Dec 2012 14:31:11 -0000\r
+\r
+Austin Clements <amdragon@MIT.EDU> writes:\r
+\r
+> +    char *out = talloc_strdup (ctx, pos + 1);\r
+> +    int closed = 0;\r
+> +    /* Find the closing quote and un-double doubled internal\r
+> +     * quotes. */\r
+> +    for (pos = *term_out = out; *pos; ) {\r
+\r
+Since you strdup anyway, wouldn't it be easier to understand if pos read\r
+from the input string and out wrote to term_out? Something like\r
+(untested) \r
+\r
+index db01b4b..e4157d0 100644\r
+--- a/util/string-util.c\r
++++ b/util/string-util.c\r
+@@ -112,11 +112,12 @@ parse_boolean_term (void *ctx, const char *str,\r
+ \r
+     /* Implement de-quoting compatible with make_boolean_term. */\r
+     if (*pos == '"') {\r
+-       char *out = talloc_strdup (ctx, pos + 1);\r
++       char *out;\r
+        int closed = 0;\r
++       *term_out= talloc_strdup (ctx, pos + 1);\r
+        /* Find the closing quote and un-double doubled internal\r
+         * quotes. */\r
+-       for (pos = *term_out = out; *pos; ) {\r
++       for (out = *term_out; *pos; ) {\r
+            if (*pos == '"') {\r
+                ++pos;\r
+\r
+\r
+Perhaps the two talloc_strdups can even be unified, but I wouldn't worry\r
+too much about that.\r