[PATCH 1/3] cli: Return an error code from add_message_to_database

diff --git a/99/c8539fc3589a33fd323fb1bb22bb4a0486de32 b/99/c8539fc3589a33fd323fb1bb22bb4a0486de32
new file mode 100644 (file)
index 0000000..25b5611
--- /dev/null
+++ b/99/c8539fc3589a33fd323fb1bb22bb4a0486de32
@@ -0,0 +1,100 @@
+Return-Path: <awg@lagos.xvx.ca>\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 51C03431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 13 Jul 2013 17:55:49 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_NONE=-0.0001] 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 kne9YvzV4uQQ for <notmuch@notmuchmail.org>;\r
+       Sat, 13 Jul 2013 17:55:48 -0700 (PDT)\r
+Received: from smtp-out-01.shaw.ca (smtp-out-01.shaw.ca [64.59.136.137])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1BF96431FD0\r
+       for <notmuch@notmuchmail.org>; Sat, 13 Jul 2013 17:55:37 -0700 (PDT)\r
+X-Cloudmark-SP-Filtered: true\r
+X-Cloudmark-SP-Result: v=1.1 cv=GLqYwptGXHjY6tPk5kWRtHXJM/YfZPTWiIs1znw4zms=\r
+       c=1 sm=1\r
+       a=529rJtm0sH4A:10 a=BLceEmwcHowA:10 a=gumk1giGF0obp6xRQyl7Yg==:17\r
+       a=6LECOPO3Nxskhww-8YwA:9 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117\r
+Received: from unknown (HELO lagos.xvx.ca) ([68.150.39.45])\r
+       by smtp-out-01.shaw.ca with ESMTP; 13 Jul 2013 18:46:01 -0600\r
+Received: by lagos.xvx.ca (Postfix, from userid 1000)\r
+       id ADDF48009323; Sat, 13 Jul 2013 18:46:01 -0600 (MDT)\r
+From: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] cli: Return an error code from add_message_to_database\r
+Date: Sat, 13 Jul 2013 18:45:44 -0600\r
+Message-Id: <1373762746-22308-2-git-send-email-awg+notmuch@xvx.ca>\r
+X-Mailer: git-send-email 1.7.9.5\r
+In-Reply-To: <1373762746-22308-1-git-send-email-awg+notmuch@xvx.ca>\r
+References: <1373762746-22308-1-git-send-email-awg+notmuch@xvx.ca>\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: Sun, 14 Jul 2013 00:55:49 -0000\r
+\r
+The error code isn't necessary when we're inserting a new message from\r
+standard input, but it will be useful for an upcoming command that\r
+allows an existing file to be indexed.\r
+---\r
+ notmuch-insert.c |    8 +++++---\r
+ 1 file changed, 5 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 2207b1e..d32a535 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -293,7 +293,7 @@ copy_stdin (int fdin, int fdout)\r
+ \r
+ /* Add the specified message file to the notmuch database, applying tags.\r
+  * The file is renamed to encode notmuch tags as maildir flags. */\r
+-static void\r
++static int\r
+ add_file_to_database (notmuch_database_t *notmuch, const char *path,\r
+                     tag_op_list_t *tag_ops)\r
+ {\r
+@@ -318,7 +318,7 @@ add_file_to_database (notmuch_database_t *notmuch, const char *path,\r
+     case NOTMUCH_STATUS_LAST_STATUS:\r
+       fprintf (stderr, "Error: failed to add `%s' to notmuch database: %s\n",\r
+                path, notmuch_status_to_string (status));\r
+-      return;\r
++      return status;\r
+     }\r
+ \r
+     if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {\r
+@@ -331,6 +331,8 @@ add_file_to_database (notmuch_database_t *notmuch, const char *path,\r
+     }\r
+ \r
+     notmuch_message_destroy (message);\r
++\r
++    return status;\r
+ }\r
+ \r
+ static notmuch_bool_t\r
+@@ -377,7 +379,7 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+ \r
+     /* Even if adding the message to the notmuch database fails,\r
+      * the message is on disk and we consider the delivery completed. */\r
+-    add_file_to_database (notmuch, newpath, tag_ops);\r
++    (void) add_file_to_database (notmuch, newpath, tag_ops);\r
+ \r
+     return TRUE;\r
+ \r
+-- \r
+1.7.9.5\r
+\r