[PATCH v2 05/20] insert: copy stdin to Maildir tmp file

diff --git a/d7/861c0810608ff4b9ddd99a19e5ff98b50b744e b/d7/861c0810608ff4b9ddd99a19e5ff98b50b744e
new file mode 100644 (file)
index 0000000..f8ac421
--- /dev/null
+++ b/d7/861c0810608ff4b9ddd99a19e5ff98b50b744e
@@ -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 0D324431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:35 -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 8WXfhL7oIgKz for <notmuch@notmuchmail.org>;\r
+       Sat, 24 Nov 2012 17:17:33 -0800 (PST)\r
+Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com\r
+       [209.85.220.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id AC5EF431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:33 -0800 (PST)\r
+Received: by mail-pa0-f53.google.com with SMTP id hz1so3911431pad.26\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:33 -0800 (PST)\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=lxIudV5S+FSlgaCBq0m3vsV/SJuMlY/rNRgJfmWBVhE=;\r
+       b=n1Lzc6huswj+RMfIu43d/b8ElRVuheZGMANULjmlK5lZZjcXIS4CRiT7wqyEFcIp+k\r
+       AkgpbSAU8Eot5lHpCe7HuvID39JNd9kbVXGjvGmuFZhM9MWRKpFoRqKugesYO1+MuqGC\r
+       wog1jvkBJXeGxNrVz1Do2ZKZIaeOYtL2fFhI+hFJrwDoEj7BOEGRHCpg7/6vWTNFGW5y\r
+       Yl9+6sVM2zveS6EfKOandUAwM0ybNaeGQSXMMU9tyJYHq11cmn+okS52WAf0aZuWJB8D\r
+       N7NcYV4iJbrWq5bmfMMZSX5q0nV9pjK9D5u1vzhLztzFuZ3Fnw4WDV7z8Nl4aeoSeehD\r
+       xOsg==\r
+Received: by 10.68.232.200 with SMTP id tq8mr26399660pbc.52.1353806252961;\r
+       Sat, 24 Nov 2012 17:17:32 -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 ix9sm6232405pbc.7.2012.11.24.17.17.30\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 24 Nov 2012 17:17:32 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 05/20] insert: copy stdin to Maildir tmp file\r
+Date: Sun, 25 Nov 2012 12:16:31 +1100\r
+Message-Id: <1353806206-29133-6-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com>\r
+References: <1353806206-29133-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, 25 Nov 2012 01:17:35 -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 371fb47..88e8533 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 fdin into fdout. */\r
++static notmuch_bool_t\r
++copy_fd_data (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_fd_data (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