From f31635d69d2378a495978e632e46eae379b87f80 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 7 Jan 2013 23:16:46 +2000 Subject: [PATCH] [Patch v2 1/9] tag-util: factor out rules for illegal tags, use in parse_tag_line --- 05/6145defd06bf00f6e848464f00d6ce43dd76ff | 120 ++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 05/6145defd06bf00f6e848464f00d6ce43dd76ff diff --git a/05/6145defd06bf00f6e848464f00d6ce43dd76ff b/05/6145defd06bf00f6e848464f00d6ce43dd76ff new file mode 100644 index 000000000..5c0544991 --- /dev/null +++ b/05/6145defd06bf00f6e848464f00d6ce43dd76ff @@ -0,0 +1,120 @@ +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 5E7F6429E44 + for ; Sun, 6 Jan 2013 19:17:14 -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 u+Tpg2suDh2q for ; + Sun, 6 Jan 2013 19:17:13 -0800 (PST) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 2F2BB429E3A + for ; Sun, 6 Jan 2013 19:17:12 -0800 (PST) +Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.82.78] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) + (envelope-from ) + id 1Ts3D2-0002dw-RM; Sun, 06 Jan 2013 23:17:09 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1Ts3Cx-0001hl-9k; Sun, 06 Jan 2013 23:17:03 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [Patch v2 1/9] tag-util: factor out rules for illegal tags, + use in parse_tag_line +Date: Sun, 6 Jan 2013 23:16:46 -0400 +Message-Id: <1357528614-6413-2-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1357528614-6413-1-git-send-email-david@tethera.net> +References: <1357528614-6413-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: Mon, 07 Jan 2013 03:17:14 -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 | 36 +++++++++++++++++++++++++++++++----- + 1 file changed, 31 insertions(+), 5 deletions(-) + +diff --git a/tag-util.c b/tag-util.c +index ca12b3b..0a4fe78 100644 +--- a/tag-util.c ++++ b/tag-util.c +@@ -31,6 +31,30 @@ 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 "empty tag forbidden"; ++ ++ /* This disallows adding the non-removable tag "-" and ++ * enables notmuch tag to take long options more easily. ++ */ ++ ++ if (*tag == '-' && ! remove) ++ return "tag starting with '-' forbidden"; ++ ++ return NULL; ++} ++ + tag_parse_status_t + parse_tag_line (void *ctx, char *line, + tag_op_flag_t flags, +@@ -95,11 +119,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 + -- 2.26.2