[PATCH v2 11/20] insert: parse command-line tag operations

diff --git a/af/bb4225d3f4dbe0a6ce70f0edcec6fd4f12389e b/af/bb4225d3f4dbe0a6ce70f0edcec6fd4f12389e
new file mode 100644 (file)
index 0000000..111b30f
--- /dev/null
+++ b/af/bb4225d3f4dbe0a6ce70f0edcec6fd4f12389e
@@ -0,0 +1,112 @@
+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 A1F61431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:07 -0800 (PST)\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 rf2XotP78riA for <notmuch@notmuchmail.org>;\r
+       Sat, 24 Nov 2012 17:18:07 -0800 (PST)\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 243D1431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:07 -0800 (PST)\r
+Received: by mail-pb0-f53.google.com with SMTP id jt11so7944513pbb.26\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:06 -0800 (PST)\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=YOMokdKYA8DYzsQF25kQJ9Ay494Tn9UWiKnCJG815GI=;\r
+       b=SyIAJ351q41bIGA/zdBVbEQSfi3iQUfP20qrwEv0PgphFe54AminWwdVJ2k/r5GNZU\r
+       im6SX+zV0wWEf9MCpNzKskSYQRkquA1JDwnKj/xgYr59in8SlwFjZ+LII+dQ6K7rCibK\r
+       mdhoQcg8DtnYwOthTBeNO9LpZdw8eLN2TxlKILlYBNN7hPPzbq/5fQws2pCivvAOn+QN\r
+       cbE0TDHNuX+8RBGyzRRQgNBFen7L+MBMx2I/DL7gfp8sX5sUGSEzGXDcVqMqH6Cs+Yat\r
+       BD9SgvQ2har8QNLbm6vkvBjMjYSOxLsvA1PVNGiKRV7in0ZgEmcjyd5B5HWdMOjqJYIE\r
+       woxA==\r
+Received: by 10.68.234.167 with SMTP id uf7mr26444347pbc.20.1353806286903;\r
+       Sat, 24 Nov 2012 17:18:06 -0800 (PST)\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 p5sm5944688paz.22.2012.11.24.17.18.04\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 24 Nov 2012 17:18:05 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 11/20] insert: parse command-line tag operations\r
+Date: Sun, 25 Nov 2012 12:16:37 +1100\r
+Message-Id: <1353806206-29133-12-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com>\r
+References: <1353806206-29133-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: Sun, 25 Nov 2012 01:18:07 -0000\r
+\r
+Reuse the parser in notmuch-tag.c to parse +tag and -tag\r
+operations on the 'insert' command-line.\r
+---\r
+ notmuch-insert.c | 23 +++++++++++++++++++++++\r
+ 1 file changed, 23 insertions(+)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 362da66..e4631a2 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -262,6 +262,8 @@ 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
++    notmuch_tag_operation_t *tag_ops;\r
++    int tag_ops_count;\r
+     char *maildir;\r
+     int opt_index;\r
+     notmuch_bool_t ret;\r
+@@ -279,6 +281,27 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+       return 1;\r
+     }\r
+ \r
++    /* Array of tagging operations (add or remove), terminated with an\r
++     * empty element. */\r
++    tag_ops = talloc_array (ctx, notmuch_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
++    opt_index = parse_tag_operations (opt_index, argc, argv,\r
++                                    tag_ops, &tag_ops_count);\r
++    if (opt_index < 0)\r
++      return 1;\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.12.1\r
+\r