[PATCH v3 03/20] insert: copy stdin to Maildir tmp file

diff --git a/cc/c2bc9591610c252dbbb543674c3bd50f1e6f64 b/cc/c2bc9591610c252dbbb543674c3bd50f1e6f64
new file mode 100644 (file)
index 0000000..54e3acc
--- /dev/null
+++ b/cc/c2bc9591610c252dbbb543674c3bd50f1e6f64
@@ -0,0 +1,145 @@
+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 6FC26431FDA\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:50:53 -0800 (PST)\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 NOvHwOEl2grh for <notmuch@notmuchmail.org>;\r
+       Sat, 19 Jan 2013 16:50:52 -0800 (PST)\r
+Received: from mail-pb0-f47.google.com (mail-pb0-f47.google.com\r
+       [209.85.160.47]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id F24E3429E25\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:50:48 -0800 (PST)\r
+Received: by mail-pb0-f47.google.com with SMTP id wz17so2682537pbc.6\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:50:48 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+       :references; bh=nCiX83/rEGYX4NdG4jvMp8tfXBvbqAKwli6PX/6Euxg=;\r
+       b=N6ZMPAncXzDzwvk8r/9N13hoBDZQ6m9WJmh349QvO12E+ngErmplXt6GEGJxKv2RiV\r
+       b49VD7I5jDQ9gqdbgiLfnBon/nrOOJdHBjN8VXtVa1fZBLuGNAowH8MrcI3hkjqgYLvP\r
+       f4sKWlM26IeimFpn/icEDZwpJdTUZlRh/mIJlrtVdIIUJxrM2nDlPhXnkqPtCmvZZV13\r
+       i6QPNvXuwbUxJCMy8L3q6kil7q0AlXDzsjbPpK5N2CDwc8/qManlfdoeM/iK2zUBqXXv\r
+       LFfa7NYmm/7+0YzGj14jSDSvxmXdfSd2f/KuTk/+IRMLt91bTf3C9qrptVNXyMTe/n6/\r
+       g2yg==\r
+X-Received: by 10.66.77.99 with SMTP id r3mr36528025paw.10.1358643048098;\r
+       Sat, 19 Jan 2013 16:50:48 -0800 (PST)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPS id z10sm6273786pay.7.2013.01.19.16.50.45\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 19 Jan 2013 16:50:47 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 03/20] insert: copy stdin to Maildir tmp file\r
+Date: Sun, 20 Jan 2013 11:49:47 +1100\r
+Message-Id: <1358643004-14522-4-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com>\r
+References: <1358643004-14522-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: Sun, 20 Jan 2013 00:50:53 -0000\r
+\r
+Read the new message from standard input into the Maildir tmp file.\r
+---\r
+ notmuch-insert.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++----\r
+ 1 file changed, 47 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 7d100ae..38e815f 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -94,6 +94,47 @@ maildir_open_tmp_file (void *ctx, const char *dir,\r
+     return fd;\r
+ }\r
+ \r
++/* Copy the contents of standard input (fdin) into fdout. */\r
++static notmuch_bool_t\r
++copy_stdin (int fdin, int fdout)\r
++{\r
++    char buf[4096];\r
++    char *p;\r
++    ssize_t remain;\r
++    ssize_t written;\r
++\r
++    for (;;) {\r
++      remain = read (fdin, buf, sizeof (buf));\r
++      if (remain == 0)\r
++          break;\r
++      if (remain < 0) {\r
++          if (errno == EINTR)\r
++              continue;\r
++          fprintf (stderr, "Error: reading from standard input: %s\n",\r
++                   strerror (errno));\r
++          return FALSE;\r
++      }\r
++\r
++      p = buf;\r
++      do {\r
++          written = write (fdout, p, remain);\r
++          if (written == 0)\r
++              return FALSE;\r
++          if (written < 0) {\r
++              if (errno == EINTR)\r
++                  continue;\r
++              fprintf (stderr, "Error: writing to temporary file: %s",\r
++                       strerror (errno));\r
++              return FALSE;\r
++          }\r
++          p += written;\r
++          remain -= written;\r
++      } while (remain > 0);\r
++    }\r
++\r
++    return TRUE;\r
++}\r
++\r
+ static notmuch_bool_t\r
+ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+               const char *dir)\r
+@@ -101,16 +142,18 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+     char *tmppath;\r
+     char *newpath;\r
+     int fdout;\r
++    notmuch_bool_t ret;\r
+ \r
+     fdout = maildir_open_tmp_file (ctx, dir, &tmppath, &newpath);\r
+     if (fdout < 0) {\r
+       return FALSE;\r
+     }\r
+-\r
+-    /* For now we just delete the tmp file immediately. */\r
++    ret = copy_stdin (fdin, fdout);\r
+     close (fdout);\r
+-    unlink (tmppath);\r
+-    return FALSE;\r
++    if (!ret) {\r
++      unlink (tmppath);\r
++    }\r
++    return ret;\r
+ }\r
+ \r
+ int\r
+-- \r
+1.7.12.1\r
+\r