[PATCH 04/18] insert: copy stdin to Maildir tmp file

diff --git a/eb/169a46e1d3a8aa0a0235c33a8d136638f54013 b/eb/169a46e1d3a8aa0a0235c33a8d136638f54013
new file mode 100644 (file)
index 0000000..d8dd058
--- /dev/null
+++ b/eb/169a46e1d3a8aa0a0235c33a8d136638f54013
@@ -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 89D44431FC7\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:34 -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 nFaOfaNTjffL for <notmuch@notmuchmail.org>;\r
+       Wed, 25 Jul 2012 06:43:34 -0700 (PDT)\r
+Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com\r
+       [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id CE6DC431FC0\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:33 -0700 (PDT)\r
+Received: by pbbrr13 with SMTP id rr13so1767731pbb.26\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:32 -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=FDzi2AF74nfQDqwhuBLhWA2JoXw1SZxEaoP74HHfBMM=;\r
+       b=EqsEh9z1sLN8NcuTLr2YCY8Z6uOUGf+OorDUMZQAKStvR1JcdRG8MWFKCTPnaFRp8i\r
+       oPcqknqoSl4ASVLX73eq3RWFHUE7wdlF/W8Id5V089StT1B7skJzBbNx1wQRh2aFIE8W\r
+       4G6iobs74mcd/wuM/18KCPfd2D9Z5AU+j9ADsn2HeWJyTfr0mqIghLlDCtiU2YdPsohO\r
+       Q5T0R9wwnm68fW12YBySbC22UR+vaubtIF5iOA20uqyuuhDbuvqVDmIKXbPi6qL3G9yM\r
+       ij6TAeIqwrTLHJofPegRC5zCxdhP3p8hu3e3MQZ7lyBFsqcpjN0a3yR+9Ecfa99pKqql\r
+       7lyg==\r
+Received: by 10.68.223.198 with SMTP id qw6mr53562392pbc.94.1343223812044;\r
+       Wed, 25 Jul 2012 06:43:32 -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 ESMTPS id nv6sm14410633pbc.42.2012.07.25.06.43.29\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 25 Jul 2012 06:43:31 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 04/18] insert: copy stdin to Maildir tmp file\r
+Date: Wed, 25 Jul 2012 23:42:33 +1000\r
+Message-Id: <1343223767-9812-4-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.4.4\r
+In-Reply-To: <1343223767-9812-1-git-send-email-novalazy@gmail.com>\r
+References: <1343223767-9812-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: Wed, 25 Jul 2012 13:43:34 -0000\r
+\r
+Read the new message from standard input into the Maildir tmp file.\r
+---\r
+ notmuch-insert.c |   51 +++++++++++++++++++++++++++++++++++++++++++++++++--\r
+ 1 files changed, 49 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index f01a6f2..340f7e4 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -75,21 +75,68 @@ maildir_open_tmp (void *ctx, const char *dir, char **tmppath, char **newpath)\r
+ }\r
+ \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
+ {\r
+     char *tmppath;\r
+     char *newpath;\r
+     int fdout;\r
++    notmuch_bool_t ret;\r
+ \r
+     fdout = maildir_open_tmp (ctx, dir, &tmppath, &newpath);\r
+     if (fdout < 0) {\r
+       return FALSE;\r
+     }\r
+ \r
++    ret = copy_fd_data (fdin, fdout);\r
++\r
+     close (fdout);\r
+-    unlink (tmppath);\r
+-    return FALSE;\r
++\r
++    if (!ret) {\r
++      unlink (tmppath);\r
++    }\r
++\r
++    return ret;\r
+ }\r
+ \r
+ int\r
+-- \r
+1.7.4.4\r
+\r