[PATCH v6 01/12] tag-util: move out 'tag' command-line checks

diff --git a/b7/57309f56f919e8b9466b82c760b9115d3aac0e b/b7/57309f56f919e8b9466b82c760b9115d3aac0e
new file mode 100644 (file)
index 0000000..3d9dcb0
--- /dev/null
+++ b/b7/57309f56f919e8b9466b82c760b9115d3aac0e
@@ -0,0 +1,107 @@
+Return-Path: <novalazy@gmail.com>\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 9A27B431FBF\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Jun 2013 22:47:07 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 fBtYeTCKOpQB for <notmuch@notmuchmail.org>;\r
+       Fri, 21 Jun 2013 22:47:00 -0700 (PDT)\r
+Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com\r
+       [209.85.160.50]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id EC592431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Jun 2013 22:46:59 -0700 (PDT)\r
+Received: by mail-pb0-f50.google.com with SMTP id wz7so8692658pbc.9\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Jun 2013 22:46:59 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=ooGzRAw3WlQ1H9Bfy5Sd5QgRpxwLuzpkeSE1GT2LMuU=;\r
+       b=Ih4qzpwEdJqfaJ4WKHGwA8E0hfw4gCFFTLg3sjdjL6X+Mm1ylu78k5ka45x55w0+o6\r
+       mozV3TBGIUgC/3n56P36LhTFAd6VPEASN8rMsWiTbhhybtx6FSqrg4yfqMNyQhIvqthT\r
+       gcPI8dIkiilaKHmpIJSV+EQd+H23jO3UuZteFBWbh7JDB7rI9wsaRa61PwvOypuAVBuQ\r
+       NbR7SAlXOxGIWlC0Ff6zBdFvLlSqzJoCfic9z0emDSjJqv0t9c3CCVliroyEc5R/D47p\r
+       s+uXElOFvkOy49TnKgpBbuEk9nsIwTEnzvxnGcArd4FBI57YwANtmmy84WVIzpH8toUI\r
+       fxEQ==\r
+X-Received: by 10.69.12.65 with SMTP id eo1mr15065012pbd.205.1371880019244;\r
+       Fri, 21 Jun 2013 22:46:59 -0700 (PDT)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPSA id bg3sm7840531pbb.44.2013.06.21.22.46.56\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 21 Jun 2013 22:46:58 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v6 01/12] tag-util: move out 'tag' command-line checks\r
+Date: Sat, 22 Jun 2013 15:46:37 +1000\r
+Message-Id: <1371880008-18312-2-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1371880008-18312-1-git-send-email-novalazy@gmail.com>\r
+References: <1371880008-18312-1-git-send-email-novalazy@gmail.com>\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: Sat, 22 Jun 2013 05:47:07 -0000\r
+\r
+parse_tag_command_line checked for two error conditions which are\r
+specific to the 'tag' command.  It can be reused for the forthcoming\r
+notmuch 'insert' command if we move the checks out, into notmuch-tag.c.\r
+---\r
+ notmuch-tag.c | 5 +++++\r
+ tag-util.c    | 6 +++---\r
+ 2 files changed, 8 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/notmuch-tag.c b/notmuch-tag.c\r
+index 9a5d3e7..3b09df9 100644\r
+--- a/notmuch-tag.c\r
++++ b/notmuch-tag.c\r
+@@ -247,6 +247,11 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])\r
+           fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");\r
+           return 1;\r
+       }\r
++\r
++      if (*query_string == '\0') {\r
++          fprintf (stderr, "Error: notmuch tag requires at least one search term.\n");\r
++          return 1;\r
++      }\r
+     }\r
+ \r
+     if (notmuch_database_open (notmuch_config_get_database_path (config),\r
+diff --git a/tag-util.c b/tag-util.c\r
+index c5f5859..92e08a1 100644\r
+--- a/tag-util.c\r
++++ b/tag-util.c\r
+@@ -190,9 +190,9 @@ parse_tag_command_line (void *ctx, int argc, char **argv,\r
+ \r
+     *query_str = query_string_from_args (ctx, argc - i, &argv[i]);\r
+ \r
+-    if (*query_str == NULL || **query_str == '\0') {\r
+-      fprintf (stderr, "Error: notmuch tag requires at least one search term.\n");\r
+-      return TAG_PARSE_INVALID;\r
++    if (*query_str == NULL) {\r
++      fprintf (stderr, "Out of memory.\n");\r
++      return TAG_PARSE_OUT_OF_MEMORY;\r
+     }\r
+ \r
+     return TAG_PARSE_SUCCESS;\r
+-- \r
+1.7.12.1\r
+\r