[Patch v7 02/14] tag-util: factor out rules for illegal tags, use in parse_tag_line

diff --git a/02/c0fef1cabdda2f363ede7250cbc50a68e9ef6b b/02/c0fef1cabdda2f363ede7250cbc50a68e9ef6b
new file mode 100644 (file)
index 0000000..31443f3
--- /dev/null
+++ b/02/c0fef1cabdda2f363ede7250cbc50a68e9ef6b
@@ -0,0 +1,120 @@
+Return-Path: <bremner@tethera.net>\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 0B344431FD5\r
+       for <notmuch@notmuchmail.org>; Fri, 14 Dec 2012 05:34:53 -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 brwYMTOjT3Wr for <notmuch@notmuchmail.org>;\r
+       Fri, 14 Dec 2012 05:34:52 -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 DC3DE431FBF\r
+       for <notmuch@notmuchmail.org>; Fri, 14 Dec 2012 05:34:51 -0800 (PST)\r
+Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([142.167.90.129] 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@tethera.net>)\r
+       id 1TjVPf-0004yg-02; Fri, 14 Dec 2012 09:34:51 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TjVPZ-00021w-Gw; Fri, 14 Dec 2012 09:34:45 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v7 02/14] tag-util: factor out rules for illegal tags,\r
+       use in parse_tag_line\r
+Date: Fri, 14 Dec 2012 09:34:10 -0400\r
+Message-Id: <1355492062-7546-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1355492062-7546-1-git-send-email-david@tethera.net>\r
+References: <1355492062-7546-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\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: Fri, 14 Dec 2012 13:34:53 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This will allow us to be consistent between batch tagging and command\r
+line tagging as far as what is an illegal tag.\r
+---\r
+ tag-util.c |   36 +++++++++++++++++++++++++++++++-----\r
+ 1 file changed, 31 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/tag-util.c b/tag-util.c\r
+index 3d588d3..13d9035 100644\r
+--- a/tag-util.c\r
++++ b/tag-util.c\r
+@@ -31,6 +31,30 @@ line_error (tag_parse_status_t status,\r
+     return status;\r
+ }\r
+ \r
++/*\r
++ * Test tags for some forbidden cases.\r
++ *\r
++ * return: NULL if OK,\r
++ *       explanatory message otherwise.\r
++ */\r
++\r
++static const char *\r
++illegal_tag (const char *tag, notmuch_bool_t remove)\r
++{\r
++\r
++    if (*tag == '\0' && ! remove)\r
++      return "empty tag forbidden";\r
++\r
++    /* This disallows adding the non-removable tag "-" and\r
++     * enables notmuch tag to take long options more easily.\r
++     */\r
++\r
++    if (*tag == '-' && ! remove)\r
++      return "tag starting with '-' forbidden";\r
++\r
++    return NULL;\r
++}\r
++\r
+ tag_parse_status_t\r
+ parse_tag_line (void *ctx, char *line,\r
+               tag_op_flag_t flags,\r
+@@ -95,11 +119,13 @@ parse_tag_line (void *ctx, char *line,\r
+       remove = (*tok == '-');\r
+       tag = tok + 1;\r
+ \r
+-      /* Maybe refuse empty tags. */\r
+-      if (! (flags & TAG_FLAG_BE_GENEROUS) && *tag == '\0') {\r
+-          ret = line_error (TAG_PARSE_INVALID, line_for_error,\r
+-                            "empty tag");\r
+-          goto DONE;\r
++      /* Maybe refuse illegal tags. */\r
++      if (! (flags & TAG_FLAG_BE_GENEROUS)) {\r
++          const char *msg = illegal_tag (tag, remove);\r
++          if (msg) {\r
++              ret = line_error (TAG_PARSE_INVALID, line_for_error, msg);\r
++              goto DONE;\r
++          }\r
+       }\r
+ \r
+       /* Decode tag. */\r
+-- \r
+1.7.10.4\r
+\r