From: Peter Wang Date: Sat, 22 Jun 2013 05:46:37 +0000 (+1000) Subject: [PATCH v6 01/12] tag-util: move out 'tag' command-line checks X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11eb85ff527d042f8fdf31af193aaba21c8edefb;p=notmuch-archives.git [PATCH v6 01/12] tag-util: move out 'tag' command-line checks --- diff --git a/b7/57309f56f919e8b9466b82c760b9115d3aac0e b/b7/57309f56f919e8b9466b82c760b9115d3aac0e new file mode 100644 index 000000000..3d9dcb0bf --- /dev/null +++ b/b7/57309f56f919e8b9466b82c760b9115d3aac0e @@ -0,0 +1,107 @@ +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 9A27B431FBF + for ; Fri, 21 Jun 2013 22:47:07 -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 fBtYeTCKOpQB for ; + Fri, 21 Jun 2013 22:47:00 -0700 (PDT) +Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com + [209.85.160.50]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id EC592431FB6 + for ; Fri, 21 Jun 2013 22:46:59 -0700 (PDT) +Received: by mail-pb0-f50.google.com with SMTP id wz7so8692658pbc.9 + for ; Fri, 21 Jun 2013 22:46:59 -0700 (PDT) +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=ooGzRAw3WlQ1H9Bfy5Sd5QgRpxwLuzpkeSE1GT2LMuU=; + b=Ih4qzpwEdJqfaJ4WKHGwA8E0hfw4gCFFTLg3sjdjL6X+Mm1ylu78k5ka45x55w0+o6 + mozV3TBGIUgC/3n56P36LhTFAd6VPEASN8rMsWiTbhhybtx6FSqrg4yfqMNyQhIvqthT + gcPI8dIkiilaKHmpIJSV+EQd+H23jO3UuZteFBWbh7JDB7rI9wsaRa61PwvOypuAVBuQ + NbR7SAlXOxGIWlC0Ff6zBdFvLlSqzJoCfic9z0emDSjJqv0t9c3CCVliroyEc5R/D47p + s+uXElOFvkOy49TnKgpBbuEk9nsIwTEnzvxnGcArd4FBI57YwANtmmy84WVIzpH8toUI + fxEQ== +X-Received: by 10.69.12.65 with SMTP id eo1mr15065012pbd.205.1371880019244; + Fri, 21 Jun 2013 22:46:59 -0700 (PDT) +Received: from localhost (215.42.233.220.static.exetel.com.au. + [220.233.42.215]) + by mx.google.com with ESMTPSA id bg3sm7840531pbb.44.2013.06.21.22.46.56 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Fri, 21 Jun 2013 22:46:58 -0700 (PDT) +From: Peter Wang +To: notmuch@notmuchmail.org +Subject: [PATCH v6 01/12] tag-util: move out 'tag' command-line checks +Date: Sat, 22 Jun 2013 15:46:37 +1000 +Message-Id: <1371880008-18312-2-git-send-email-novalazy@gmail.com> +X-Mailer: git-send-email 1.7.12.1 +In-Reply-To: <1371880008-18312-1-git-send-email-novalazy@gmail.com> +References: <1371880008-18312-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: Sat, 22 Jun 2013 05:47:07 -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 +