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 03FE5431FBD for ; Tue, 2 Apr 2013 15:42:16 -0700 (PDT) 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 QZArOm1NNRng for ; Tue, 2 Apr 2013 15:42:15 -0700 (PDT) Received: from mail-pa0-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 9D085431FC2 for ; Tue, 2 Apr 2013 15:42:13 -0700 (PDT) Received: by mail-pa0-f46.google.com with SMTP id lb1so530179pab.5 for ; Tue, 02 Apr 2013 15:42:12 -0700 (PDT) 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=ooGzRAw3WlQ1H9Bfy5Sd5QgRpxwLuzpkeSE1GT2LMuU=; b=ryRsqe30gDLwvKlIOVaJHdVmVCZVebxczsAYm5b8w2FLf1c97jxt27RVlnZsiQ/yhN +wl2P3N0uu0pSn8d+WKuuV7Tle4h5UzY6Tr6XVn11W+2eYd7SARwx25rxAw/x/ICnumF gOBCh7W9v6TrfnjgbjptHQYD6eaa11mex3ArY68Lfl7w4py3nLJBWzwhGDF96ofFoNcH MXhJ8coFTxEG0hQDAUmVq0kUGYNTHfzJ9nDe/qWEwQPMVe5PT0ODNRq70ZTW3Re3iMuE gMVq+gD47QvhNoZDBCeKZlXaguFPnMZ3XR9lmVXlE1if3LTtideg+hUxjN1cR4b60QtT fgww== X-Received: by 10.68.241.102 with SMTP id wh6mr27372608pbc.150.1364942532792; Tue, 02 Apr 2013 15:42:12 -0700 (PDT) Received: from localhost (215.42.233.220.static.exetel.com.au. [220.233.42.215]) by mx.google.com with ESMTPS id tm1sm3281326pbc.11.2013.04.02.15.42.10 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 15:42:12 -0700 (PDT) From: Peter Wang To: notmuch@notmuchmail.org Subject: [PATCH v5 01/12] tag-util: move out 'tag' command-line checks Date: Wed, 3 Apr 2013 09:41:46 +1100 Message-Id: <1364942517-6982-2-git-send-email-novalazy@gmail.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1364942517-6982-1-git-send-email-novalazy@gmail.com> References: <1364942517-6982-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: Tue, 02 Apr 2013 22:42:16 -0000 parse_tag_command_line checked for two error conditions which are specific to the 'tag' command. It can be reused for the forthcoming notmuch 'insert' command if we move the checks out, into notmuch-tag.c. --- notmuch-tag.c | 5 +++++ tag-util.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/notmuch-tag.c b/notmuch-tag.c index 9a5d3e7..3b09df9 100644 --- a/notmuch-tag.c +++ b/notmuch-tag.c @@ -247,6 +247,11 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[]) fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n"); return 1; } + + if (*query_string == '\0') { + fprintf (stderr, "Error: notmuch tag requires at least one search term.\n"); + return 1; + } } if (notmuch_database_open (notmuch_config_get_database_path (config), diff --git a/tag-util.c b/tag-util.c index c5f5859..92e08a1 100644 --- a/tag-util.c +++ b/tag-util.c @@ -190,9 +190,9 @@ parse_tag_command_line (void *ctx, int argc, char **argv, *query_str = query_string_from_args (ctx, argc - i, &argv[i]); - if (*query_str == NULL || **query_str == '\0') { - fprintf (stderr, "Error: notmuch tag requires at least one search term.\n"); - return TAG_PARSE_INVALID; + if (*query_str == NULL) { + fprintf (stderr, "Out of memory.\n"); + return TAG_PARSE_OUT_OF_MEMORY; } return TAG_PARSE_SUCCESS; -- 1.7.12.1