1 Return-Path: <novalazy@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 0D324431FAF
\r
6 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:35 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id 8WXfhL7oIgKz for <notmuch@notmuchmail.org>;
\r
17 Sat, 24 Nov 2012 17:17:33 -0800 (PST)
\r
18 Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com
\r
19 [209.85.220.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id AC5EF431FAE
\r
22 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:33 -0800 (PST)
\r
23 Received: by mail-pa0-f53.google.com with SMTP id hz1so3911431pad.26
\r
24 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:33 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
27 bh=lxIudV5S+FSlgaCBq0m3vsV/SJuMlY/rNRgJfmWBVhE=;
\r
28 b=n1Lzc6huswj+RMfIu43d/b8ElRVuheZGMANULjmlK5lZZjcXIS4CRiT7wqyEFcIp+k
\r
29 AkgpbSAU8Eot5lHpCe7HuvID39JNd9kbVXGjvGmuFZhM9MWRKpFoRqKugesYO1+MuqGC
\r
30 wog1jvkBJXeGxNrVz1Do2ZKZIaeOYtL2fFhI+hFJrwDoEj7BOEGRHCpg7/6vWTNFGW5y
\r
31 Yl9+6sVM2zveS6EfKOandUAwM0ybNaeGQSXMMU9tyJYHq11cmn+okS52WAf0aZuWJB8D
\r
32 N7NcYV4iJbrWq5bmfMMZSX5q0nV9pjK9D5u1vzhLztzFuZ3Fnw4WDV7z8Nl4aeoSeehD
\r
34 Received: by 10.68.232.200 with SMTP id tq8mr26399660pbc.52.1353806252961;
\r
35 Sat, 24 Nov 2012 17:17:32 -0800 (PST)
\r
36 Received: from localhost (215.42.233.220.static.exetel.com.au.
\r
38 by mx.google.com with ESMTPS id ix9sm6232405pbc.7.2012.11.24.17.17.30
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Sat, 24 Nov 2012 17:17:32 -0800 (PST)
\r
41 From: Peter Wang <novalazy@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v2 05/20] insert: copy stdin to Maildir tmp file
\r
44 Date: Sun, 25 Nov 2012 12:16:31 +1100
\r
45 Message-Id: <1353806206-29133-6-git-send-email-novalazy@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.12.1
\r
47 In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com>
\r
48 References: <1353806206-29133-1-git-send-email-novalazy@gmail.com>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Sun, 25 Nov 2012 01:17:35 -0000
\r
63 Read the new message from standard input into the Maildir tmp file.
\r
65 notmuch-insert.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
\r
66 1 file changed, 47 insertions(+), 4 deletions(-)
\r
68 diff --git a/notmuch-insert.c b/notmuch-insert.c
\r
69 index 371fb47..88e8533 100644
\r
70 --- a/notmuch-insert.c
\r
71 +++ b/notmuch-insert.c
\r
72 @@ -94,6 +94,47 @@ maildir_open_tmp_file (void *ctx, const char *dir,
\r
76 +/* Copy the contents of fdin into fdout. */
\r
77 +static notmuch_bool_t
\r
78 +copy_fd_data (int fdin, int fdout)
\r
86 + remain = read (fdin, buf, sizeof(buf));
\r
90 + if (errno == EINTR)
\r
92 + fprintf (stderr, "Error: reading from standard input: %s\n",
\r
93 + strerror (errno));
\r
99 + written = write (fdout, p, remain);
\r
100 + if (written == 0)
\r
102 + if (written < 0) {
\r
103 + if (errno == EINTR)
\r
105 + fprintf (stderr, "Error: writing to temporary file: %s",
\r
106 + strerror (errno));
\r
110 + remain -= written;
\r
111 + } while (remain > 0);
\r
117 static notmuch_bool_t
\r
118 insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
\r
120 @@ -101,16 +142,18 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
\r
124 + notmuch_bool_t ret;
\r
126 fdout = maildir_open_tmp_file (ctx, dir, &tmppath, &newpath);
\r
131 - /* For now we just delete the tmp file immediately. */
\r
132 + ret = copy_fd_data (fdin, fdout);
\r
134 - unlink (tmppath);
\r
137 + unlink (tmppath);
\r