Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 8D5E4431FBC for ; Sun, 9 Dec 2012 15:33:55 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mLk2w3reXn4T for ; Sun, 9 Dec 2012 15:33:54 -0800 (PST) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 34EBE431FDE for ; Sun, 9 Dec 2012 15:33:53 -0800 (PST) Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net ([142.167.90.129] helo=zancas.localnet) by tesseract.cs.unb.ca with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1ThqNc-0007TE-2c; Sun, 09 Dec 2012 19:33:52 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1ThqNW-0001Da-K1; Sun, 09 Dec 2012 19:33:46 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [Patch v6 1/6] tag-util: factor out rules for illegal tags, use in parse_tag_line Date: Sun, 9 Dec 2012 19:33:23 -0400 Message-Id: <1355096008-4544-2-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355096008-4544-1-git-send-email-david@tethera.net> References: <1355096008-4544-1-git-send-email-david@tethera.net> X-Spam_bar: - Cc: David Bremner X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2012 23:33:56 -0000 From: David Bremner This will allow us to be consistent between batch tagging and command line tagging as far as what is an illegal tag. --- tag-util.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/tag-util.c b/tag-util.c index eab482f..c071ea8 100644 --- a/tag-util.c +++ b/tag-util.c @@ -31,6 +31,29 @@ line_error (tag_parse_status_t status, return status; } +/* + * Test tags for some forbidden cases. + * + * return: NULL if OK, + * explanatory message otherwise. + */ + +static const char * +illegal_tag (const char *tag, notmuch_bool_t remove) { + + if (*tag == '\0' && !remove) + return "adding empty tag"; + + /* This disallows adding the non-removable tag "-" and + * enables notmuch tag to take long options more easily. + */ + + if (*tag == '-' && !remove) + return "adding tag starting with -"; + + return NULL; +} + tag_parse_status_t parse_tag_line (void *ctx, char *line, tag_op_flag_t flags, @@ -95,11 +118,13 @@ parse_tag_line (void *ctx, char *line, remove = (*tok == '-'); tag = tok + 1; - /* Maybe refuse empty tags. */ - if (! (flags & TAG_FLAG_BE_GENEROUS) && *tag == '\0') { - ret = line_error (TAG_PARSE_INVALID, line_for_error, - "empty tag"); - goto DONE; + /* Maybe refuse illegal tags. */ + if (! (flags & TAG_FLAG_BE_GENEROUS)) { + const char *msg = illegal_tag (tag, remove); + if (msg) { + ret = line_error (TAG_PARSE_INVALID, line_for_error, msg); + goto DONE; + } } /* Decode tag. */ -- 1.7.10.4