--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 547F6431FB6\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Nov 2012 09:05:47 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 KmuJJ-Ufk78F for <notmuch@notmuchmail.org>;\r
+ Sun, 18 Nov 2012 09:05:45 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 803E3431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Nov 2012 09:05:45 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Ta8JT-0006op-O3; Sun, 18 Nov 2012 17:05:44 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Ta8JT-0003UQ-Cm; Sun, 18 Nov 2012 17:05:43 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 10/18] insert: parse command-line tag operations\r
+In-Reply-To: <1343223767-9812-10-git-send-email-novalazy@gmail.com>\r
+References: <1343223767-9812-1-git-send-email-novalazy@gmail.com>\r
+ <1343223767-9812-10-git-send-email-novalazy@gmail.com>\r
+User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 18 Nov 2012 17:05:42 +0000\r
+Message-ID: <87r4nqq1sp.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 097be4e91f00fec4afeec6e6003e71d1 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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, 18 Nov 2012 17:05:47 -0000\r
+\r
+\r
+Hi\r
+\r
+On Wed, 25 Jul 2012, Peter Wang <novalazy@gmail.com> wrote:\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
+I don't like the code duplication between this and notmuch-tag.c. In\r
+particular the two (now) differ on how they deal with malformed tags\r
+etc. Would it be possible to unify them?\r
+\r
+Best wishes\r
+\r
+Mark\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff