1 Return-Path: <jani@nikula.org>
\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 A826E431FAF
\r
6 for <notmuch@notmuchmail.org>; Sat, 9 Mar 2013 06:56:58 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
13 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id sVE43W-E6peB for <notmuch@notmuchmail.org>;
\r
17 Sat, 9 Mar 2013 06:56:58 -0800 (PST)
\r
18 Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com
\r
19 [209.85.217.172]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 0DFC0431FAE
\r
22 for <notmuch@notmuchmail.org>; Sat, 9 Mar 2013 06:56:57 -0800 (PST)
\r
23 Received: by mail-lb0-f172.google.com with SMTP id n8so2079196lbj.3
\r
24 for <notmuch@notmuchmail.org>; Sat, 09 Mar 2013 06:56:56 -0800 (PST)
\r
25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
26 d=google.com; s=20120113;
\r
27 h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to
\r
28 :references:in-reply-to:references:x-gm-message-state;
\r
29 bh=yPjzWOdSh1kW90PtUSe1QKGmaBSEWwwcXgtTDiNJhS8=;
\r
30 b=ERzn75uY6lGQQAALABva709Rv12skPJEitgHnKDLKB9ZK+YzVvWyBUfujirZ+E3hB1
\r
31 wvGygK3iinKQCjdYPxHDWcF/bgCsTBoAu7zOSzqyYIGCiUSUj5W6kK2/mgeFqg8npmlm
\r
32 VU8PrXMk0B3I7sCBUBcgNo6scYjQyBRbA9d+b0I9wc6X2/KQcQrm1IXa0Z/T02Yeu7dJ
\r
33 dBjtQG9LmMekWtrievS2cOM7ivsSDU0Jyuijvut5CCFjP69cfQq7BxE2xyvp/3zUSf6B
\r
34 N0Cek7X3w45qyu+2eaqALzrOhJmr9fk1bjvc0GGMAiMCQ/t9ZGWuswQrRcP+Pfz2XV4H
\r
36 X-Received: by 10.152.133.52 with SMTP id oz20mr5184947lab.30.1362841016522;
\r
37 Sat, 09 Mar 2013 06:56:56 -0800 (PST)
\r
38 Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.
\r
40 by mx.google.com with ESMTPS id iq6sm4256051lab.10.2013.03.09.06.56.54
\r
41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
42 Sat, 09 Mar 2013 06:56:55 -0800 (PST)
\r
43 From: Jani Nikula <jani@nikula.org>
\r
44 To: notmuch@notmuchmail.org
\r
45 Subject: [PATCH v2 1/4] cli: make caller check tag count in
\r
46 parse_tag_command_line
\r
47 Date: Sat, 9 Mar 2013 16:56:48 +0200
\r
49 <e25bebb5c141ea7291b08c81f5285484ad43fc3c.1362840893.git.jani@nikula.org>
\r
50 X-Mailer: git-send-email 1.7.10.4
\r
51 In-Reply-To: <cover.1362840893.git.jani@nikula.org>
\r
52 References: <cover.1362840893.git.jani@nikula.org>
\r
53 In-Reply-To: <cover.1362840893.git.jani@nikula.org>
\r
54 References: <cover.1362840893.git.jani@nikula.org>
\r
56 ALoCoQkc2/dRPl6Y+4XYi5BF8pFYA15kEnXjiXKqk7ap6OjrG8wxLDh2FbR6O8eUqv/WNVN6AEBo
\r
57 X-BeenThere: notmuch@notmuchmail.org
\r
58 X-Mailman-Version: 2.1.13
\r
60 List-Id: "Use and development of the notmuch mail system."
\r
61 <notmuch.notmuchmail.org>
\r
62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
63 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
65 List-Post: <mailto:notmuch@notmuchmail.org>
\r
66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
68 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
69 X-List-Received-Date: Sat, 09 Mar 2013 14:56:58 -0000
\r
72 notmuch-tag.c | 5 +++++
\r
73 tag-util.c | 5 -----
\r
74 2 files changed, 5 insertions(+), 5 deletions(-)
\r
76 diff --git a/notmuch-tag.c b/notmuch-tag.c
\r
77 index 0e73197..bc61aab 100644
\r
80 @@ -233,6 +233,11 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])
\r
81 if (parse_tag_command_line (config, argc - opt_index, argv + opt_index,
\r
82 &query_string, tag_ops))
\r
85 + if (tag_op_list_size (tag_ops) == 0) {
\r
86 + fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");
\r
91 if (notmuch_database_open (notmuch_config_get_database_path (config),
\r
92 diff --git a/tag-util.c b/tag-util.c
\r
93 index 701d329..c5f5859 100644
\r
96 @@ -188,11 +188,6 @@ parse_tag_command_line (void *ctx, int argc, char **argv,
\r
97 tag_op_list_append (tag_ops, argv[i] + 1, is_remove);
\r
100 - if (tag_op_list_size (tag_ops) == 0) {
\r
101 - fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");
\r
102 - return TAG_PARSE_INVALID;
\r
105 *query_str = query_string_from_args (ctx, argc - i, &argv[i]);
\r
107 if (*query_str == NULL || **query_str == '\0') {
\r