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 A1F61431FAF for ; Sat, 24 Nov 2012 17:18:07 -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 rf2XotP78riA for ; Sat, 24 Nov 2012 17:18:07 -0800 (PST) Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 243D1431FAE for ; Sat, 24 Nov 2012 17:18:07 -0800 (PST) Received: by mail-pb0-f53.google.com with SMTP id jt11so7944513pbb.26 for ; Sat, 24 Nov 2012 17:18:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=YOMokdKYA8DYzsQF25kQJ9Ay494Tn9UWiKnCJG815GI=; b=SyIAJ351q41bIGA/zdBVbEQSfi3iQUfP20qrwEv0PgphFe54AminWwdVJ2k/r5GNZU im6SX+zV0wWEf9MCpNzKskSYQRkquA1JDwnKj/xgYr59in8SlwFjZ+LII+dQ6K7rCibK mdhoQcg8DtnYwOthTBeNO9LpZdw8eLN2TxlKILlYBNN7hPPzbq/5fQws2pCivvAOn+QN cbE0TDHNuX+8RBGyzRRQgNBFen7L+MBMx2I/DL7gfp8sX5sUGSEzGXDcVqMqH6Cs+Yat BD9SgvQ2har8QNLbm6vkvBjMjYSOxLsvA1PVNGiKRV7in0ZgEmcjyd5B5HWdMOjqJYIE woxA== Received: by 10.68.234.167 with SMTP id uf7mr26444347pbc.20.1353806286903; Sat, 24 Nov 2012 17:18:06 -0800 (PST) Received: from localhost (215.42.233.220.static.exetel.com.au. [220.233.42.215]) by mx.google.com with ESMTPS id p5sm5944688paz.22.2012.11.24.17.18.04 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 24 Nov 2012 17:18:05 -0800 (PST) From: Peter Wang To: notmuch@notmuchmail.org Subject: [PATCH v2 11/20] insert: parse command-line tag operations Date: Sun, 25 Nov 2012 12:16:37 +1100 Message-Id: <1353806206-29133-12-git-send-email-novalazy@gmail.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com> References: <1353806206-29133-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, 25 Nov 2012 01:18:07 -0000 Reuse the parser in notmuch-tag.c to parse +tag and -tag operations on the 'insert' command-line. --- notmuch-insert.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/notmuch-insert.c b/notmuch-insert.c index 362da66..e4631a2 100644 --- a/notmuch-insert.c +++ b/notmuch-insert.c @@ -262,6 +262,8 @@ notmuch_insert_command (void *ctx, int argc, char *argv[]) const char **new_tags; size_t new_tags_length; const char *folder = NULL; + notmuch_tag_operation_t *tag_ops; + int tag_ops_count; char *maildir; int opt_index; notmuch_bool_t ret; @@ -279,6 +281,27 @@ notmuch_insert_command (void *ctx, int argc, char *argv[]) return 1; } + /* Array of tagging operations (add or remove), terminated with an + * empty element. */ + tag_ops = talloc_array (ctx, notmuch_tag_operation_t, argc - opt_index + 1); + if (tag_ops == NULL) { + fprintf (stderr, "Out of memory.\n"); + return 1; + } + + opt_index = parse_tag_operations (opt_index, argc, argv, + tag_ops, &tag_ops_count); + if (opt_index < 0) + return 1; + + tag_ops[tag_ops_count].tag = NULL; + + if (opt_index != argc) { + fprintf (stderr, "Error: bad argument to notmuch insert: %s\n", + argv[opt_index]); + return 1; + } + config = notmuch_config_open (ctx, NULL, NULL); if (config == NULL) return 1; -- 1.7.12.1