Re: [Patch v6 1/6] tag-util: factor out rules for illegal tags, use in parse_tag_line

diff --git a/dc/d3ebfb36ea1690f3fe96b7f8cd2b8e6e163947 b/dc/d3ebfb36ea1690f3fe96b7f8cd2b8e6e163947
new file mode 100644 (file)
index 0000000..44ea2aa
--- /dev/null
+++ b/dc/d3ebfb36ea1690f3fe96b7f8cd2b8e6e163947
@@ -0,0 +1,156 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 7DA8F431FBC\r
+       for <notmuch@notmuchmail.org>; Thu, 13 Dec 2012 14:07:38 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 4o2c+Vw3a0TM for <notmuch@notmuchmail.org>;\r
+       Thu, 13 Dec 2012 14:07:38 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C0A70431FB6\r
+       for <notmuch@notmuchmail.org>; Thu, 13 Dec 2012 14:07:37 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1TjGwF-0003Wm-7C; Thu, 13 Dec 2012 22:07:33 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1TjGwE-0005vV-UR; Thu, 13 Dec 2012 22:07:31 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v6 1/6] tag-util: factor out rules for illegal tags,\r
+       use in parse_tag_line\r
+In-Reply-To: <1355096008-4544-2-git-send-email-david@tethera.net>\r
+References: <1355096008-4544-1-git-send-email-david@tethera.net>\r
+       <1355096008-4544-2-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.14+155~g7edfdc3 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Thu, 13 Dec 2012 22:07:32 +0000\r
+Message-ID: <871uettxln.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: 58d2b61d88fae9d87e3bd6eab48cee79 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Thu, 13 Dec 2012 22:07:38 -0000\r
+\r
+\r
+I don't know if this matters but it seems that one can still add a "-"\r
+tag by doing something like\r
+\r
+echo "+%2d -- search" | notmuch tag --batch\r
+\r
+This might be the right thing to do but I thought I would mention it.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+On Sun, 09 Dec 2012, david@tethera.net wrote:\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 |   35 ++++++++++++++++++++++++++++++-----\r
+>  1 file changed, 30 insertions(+), 5 deletions(-)\r
+>\r
+> diff --git a/tag-util.c b/tag-util.c\r
+> index eab482f..c071ea8 100644\r
+> --- a/tag-util.c\r
+> +++ b/tag-util.c\r
+> @@ -31,6 +31,29 @@ 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
+> +    if (*tag == '\0' && !remove)\r
+> +    return "adding empty tag";\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  "adding tag starting with -";\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 +118,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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r