--- /dev/null
+Return-Path: <novalazy@gmail.com>\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 0152E431FDC\r
+ for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:44:10 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 KwdukMViGVzD for <notmuch@notmuchmail.org>;\r
+ Wed, 25 Jul 2012 06:44:09 -0700 (PDT)\r
+Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com\r
+ [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 8D937431FAE\r
+ for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:44:09 -0700 (PDT)\r
+Received: by mail-pb0-f53.google.com with SMTP id rr13so1767731pbb.26\r
+ for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:44:09 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+ bh=znSJ6OY/HEngoNx3sDcCsFahxHQeS923hhE/P7Llewk=;\r
+ b=XrHMAxzY6Z8ezbaBCaWCJGg0/5MaYWkZ/ztJxQ0iDdpIQPY4l/DP+voBeA0bBLWN4p\r
+ QW9JXTI4t7PcB0xImio0GDqYtkxSNbiZnRreACp+YDCsc9lIMUPPs66FEnYNwvE03RYi\r
+ la1XDnFbR1uk8MZhERd1n2Uu+yCruw1z6Rwnu08kYU8PXtsHKjH/7uah58e2SKsz8MJA\r
+ FIAzjquErcufYkomhLHJj5ZwlfEd85OS4dpHkLSQ5op4zJgvER96zx8xPxYhLbF1S2wH\r
+ iomXCzh2dK/PBGByWBkZwgzsMEvvXw5cDVZ6Dg8TTp6eMPsnalmPjiiMGa5HlLPew/50\r
+ Xv9w==\r
+Received: by 10.68.231.10 with SMTP id tc10mr53678564pbc.107.1343223849378;\r
+ Wed, 25 Jul 2012 06:44:09 -0700 (PDT)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+ [220.233.42.215])\r
+ by mx.google.com with ESMTPS id ny4sm14408899pbb.57.2012.07.25.06.44.06\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Wed, 25 Jul 2012 06:44:08 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 10/18] insert: parse command-line tag operations\r
+Date: Wed, 25 Jul 2012 23:42:39 +1000\r
+Message-Id: <1343223767-9812-10-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.4.4\r
+In-Reply-To: <1343223767-9812-1-git-send-email-novalazy@gmail.com>\r
+References: <1343223767-9812-1-git-send-email-novalazy@gmail.com>\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: Wed, 25 Jul 2012 13:44:11 -0000\r
+\r
+Parse +tag and -tag on the 'insert' command-line.\r
+Issue a warning about ambiguous -tag arguments which don't follow\r
++tag nor an explicit option list terminator.\r
+---\r
+ notmuch-insert.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++\r
+ 1 files changed, 50 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 4fb3ea3..6db03e3 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -24,6 +24,11 @@\r
+ #include <sys/stat.h>\r
+ #include <fcntl.h>\r
+ \r
++typedef struct {\r
++ const char *tag;\r
++ notmuch_bool_t remove;\r
++} tag_operation_t;\r
++\r
+ static notmuch_bool_t\r
+ check_folder_name (const char *folder)\r
+ {\r
+@@ -236,8 +241,11 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+ const char **new_tags;\r
+ size_t new_tags_length;\r
+ const char *folder = NULL;\r
++ tag_operation_t *tag_ops;\r
++ int tag_ops_count = 0;\r
+ char *maildir;\r
+ int opt_index;\r
++ notmuch_bool_t warn_tag_rem;\r
+ notmuch_bool_t ret;\r
+ \r
+ notmuch_opt_desc_t options[] = {\r
+@@ -253,6 +261,48 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+ return 1;\r
+ }\r
+ \r
++ if (opt_index > 0 && strcmp (argv[opt_index - 1], "--") == 0) {\r
++ warn_tag_rem = FALSE;\r
++ } else {\r
++ warn_tag_rem = TRUE;\r
++ }\r
++\r
++ /* Array of tagging operations (add or remove), terminated with an\r
++ * empty element. */\r
++ tag_ops = talloc_array (ctx, tag_operation_t, argc - opt_index + 1);\r
++ if (tag_ops == NULL) {\r
++ fprintf (stderr, "Out of memory.\n");\r
++ return 1;\r
++ }\r
++\r
++ for (; opt_index < argc; opt_index++) {\r
++ if (argv[opt_index][0] == '+') {\r
++ tag_ops[tag_ops_count].tag = argv[opt_index] + 1;\r
++ tag_ops[tag_ops_count].remove = FALSE;\r
++ tag_ops_count++;\r
++ warn_tag_rem = FALSE;\r
++ } else if (argv[opt_index][0] == '-') {\r
++ if (warn_tag_rem) {\r
++ fprintf (stderr,\r
++ "Warning: ambiguous argument treated as tag removal: %s\n",\r
++ argv[opt_index]);\r
++ }\r
++ tag_ops[tag_ops_count].tag = argv[opt_index] + 1;\r
++ tag_ops[tag_ops_count].remove = TRUE;\r
++ tag_ops_count++;\r
++ } else {\r
++ break;\r
++ }\r
++ }\r
++\r
++ tag_ops[tag_ops_count].tag = NULL;\r
++\r
++ if (opt_index != argc) {\r
++ fprintf (stderr, "Error: bad argument to notmuch insert: %s\n",\r
++ argv[opt_index]);\r
++ return 1;\r
++ }\r
++\r
+ config = notmuch_config_open (ctx, NULL, NULL);\r
+ if (config == NULL)\r
+ return 1;\r
+-- \r
+1.7.4.4\r
+\r
projects / notmuch-archives.git / commitdiff