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 6526F429E34 for ; Sat, 19 Jan 2013 16:51:30 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.799 X-Spam-Level: X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 L8q5iSqq+jH5 for ; Sat, 19 Jan 2013 16:51:29 -0800 (PST) Received: from mail-pb0-f44.google.com (mail-pb0-f44.google.com [209.85.160.44]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id E407D431FB6 for ; Sat, 19 Jan 2013 16:51:17 -0800 (PST) Received: by mail-pb0-f44.google.com with SMTP id uo1so2676528pbc.31 for ; Sat, 19 Jan 2013 16:51:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=2wGbHmmBHHNifXscxMfxkOeExRYtYyyPcudnN3AgbqA=; b=vRnM4vXYjPlL72f5/5w8UdqfcImq0Tl4hnj6a8wliD064jZDVwbhSMgHAstxYNmDkR 3uOhFl3CEE7VVk1xZqQScBpMg1eW/dB6MPEyZYpMjvbu8a7hueIeJoiQsrf/KcHjdCUK KvxbeA2AUWO0dWtI2GtmqOrwyRdCRxLD9QSt76/ATAn6ZJaErWcHDQfeLdLFFvyGuxub fVJklP3hwMAi25dSA+RWY37YNFahzNq4Zau0dqpJvTWAQgnslDSlV/MUJS2ABOP4sLCd rAxhUEBz64R782ABtBJmKtel5FWczaqGw7Bujk1pZPq5dRqG4kcAKqSqucOMrsH9tmOf 4WtA== X-Received: by 10.66.73.105 with SMTP id k9mr36420639pav.37.1358643077033; Sat, 19 Jan 2013 16:51:17 -0800 (PST) Received: from localhost (215.42.233.220.static.exetel.com.au. [220.233.42.215]) by mx.google.com with ESMTPS id hc4sm5803265pbc.30.2013.01.19.16.51.15 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 16:51:16 -0800 (PST) From: Peter Wang To: notmuch@notmuchmail.org Subject: [PATCH v3 09/20] insert: parse and apply command-line tag operations Date: Sun, 20 Jan 2013 11:49:53 +1100 Message-Id: <1358643004-14522-10-git-send-email-novalazy@gmail.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com> References: <1358643004-14522-1-git-send-email-novalazy@gmail.com> 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: Sun, 20 Jan 2013 00:51:30 -0000 Parse +tag and -tag operations on the 'insert' command-line and apply them to the inserted message in addition to new.tags. --- notmuch-insert.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/notmuch-insert.c b/notmuch-insert.c index 8388d07..b0ac174 100644 --- a/notmuch-insert.c +++ b/notmuch-insert.c @@ -235,7 +235,9 @@ notmuch_insert_command (void *ctx, int argc, char *argv[]) const char **new_tags; size_t new_tags_length; tag_op_list_t *tag_ops; + char *query_string = NULL; char *maildir; + int opt_index = 1; unsigned int i; notmuch_bool_t ret; @@ -256,6 +258,15 @@ notmuch_insert_command (void *ctx, int argc, char *argv[]) return 1; } + if (parse_tag_command_line (ctx, argc - opt_index, argv + opt_index, + &query_string, tag_ops)) + return 1; + + if (*query_string != '\0') { + fprintf (stderr, "Error: unexpected query string: %s\n", query_string); + return 1; + } + maildir = talloc_asprintf (ctx, "%s", db_path); if (! maildir) { fprintf (stderr, "Out of memory\n"); -- 1.7.12.1