1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 8D5E4431FBC
\r
6 for <notmuch@notmuchmail.org>; Sun, 9 Dec 2012 15:33:55 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id mLk2w3reXn4T for <notmuch@notmuchmail.org>;
\r
16 Sun, 9 Dec 2012 15:33:54 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 34EBE431FDE
\r
21 for <notmuch@notmuchmail.org>; Sun, 9 Dec 2012 15:33:53 -0800 (PST)
\r
22 Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([142.167.90.129] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1ThqNc-0007TE-2c; Sun, 09 Dec 2012 19:33:52 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1ThqNW-0001Da-K1; Sun, 09 Dec 2012 19:33:46 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [Patch v6 1/6] tag-util: factor out rules for illegal tags,
\r
34 use in parse_tag_line
\r
35 Date: Sun, 9 Dec 2012 19:33:23 -0400
\r
36 Message-Id: <1355096008-4544-2-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.10.4
\r
38 In-Reply-To: <1355096008-4544-1-git-send-email-david@tethera.net>
\r
39 References: <1355096008-4544-1-git-send-email-david@tethera.net>
\r
41 Cc: David Bremner <bremner@debian.org>
\r
42 X-BeenThere: notmuch@notmuchmail.org
\r
43 X-Mailman-Version: 2.1.13
\r
45 List-Id: "Use and development of the notmuch mail system."
\r
46 <notmuch.notmuchmail.org>
\r
47 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
49 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
50 List-Post: <mailto:notmuch@notmuchmail.org>
\r
51 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
52 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
54 X-List-Received-Date: Sun, 09 Dec 2012 23:33:56 -0000
\r
56 From: David Bremner <bremner@debian.org>
\r
58 This will allow us to be consistent between batch tagging and command
\r
59 line tagging as far as what is an illegal tag.
\r
61 tag-util.c | 35 ++++++++++++++++++++++++++++++-----
\r
62 1 file changed, 30 insertions(+), 5 deletions(-)
\r
64 diff --git a/tag-util.c b/tag-util.c
\r
65 index eab482f..c071ea8 100644
\r
68 @@ -31,6 +31,29 @@ line_error (tag_parse_status_t status,
\r
73 + * Test tags for some forbidden cases.
\r
75 + * return: NULL if OK,
\r
76 + * explanatory message otherwise.
\r
79 +static const char *
\r
80 +illegal_tag (const char *tag, notmuch_bool_t remove) {
\r
82 + if (*tag == '\0' && !remove)
\r
83 + return "adding empty tag";
\r
85 + /* This disallows adding the non-removable tag "-" and
\r
86 + * enables notmuch tag to take long options more easily.
\r
89 + if (*tag == '-' && !remove)
\r
90 + return "adding tag starting with -";
\r
96 parse_tag_line (void *ctx, char *line,
\r
97 tag_op_flag_t flags,
\r
98 @@ -95,11 +118,13 @@ parse_tag_line (void *ctx, char *line,
\r
99 remove = (*tok == '-');
\r
102 - /* Maybe refuse empty tags. */
\r
103 - if (! (flags & TAG_FLAG_BE_GENEROUS) && *tag == '\0') {
\r
104 - ret = line_error (TAG_PARSE_INVALID, line_for_error,
\r
107 + /* Maybe refuse illegal tags. */
\r
108 + if (! (flags & TAG_FLAG_BE_GENEROUS)) {
\r
109 + const char *msg = illegal_tag (tag, remove);
\r
111 + ret = line_error (TAG_PARSE_INVALID, line_for_error, msg);
\r