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 1DFDF431FAF
\r
6 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:41 -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 N3fB0DDv-kdm for <notmuch@notmuchmail.org>;
\r
17 Sat, 24 Nov 2012 17:17:39 -0800 (PST)
\r
18 Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com
\r
19 [209.85.160.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 02809431FAE
\r
22 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:38 -0800 (PST)
\r
23 Received: by mail-pb0-f53.google.com with SMTP id jt11so7944513pbb.26
\r
24 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:38 -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=/5WC3yqOeQYw9GDHmPQJR+fWU4YUCc3fNiKr1yk5FB0=;
\r
28 b=tasuYoiyG7UxLKUVRaVHiiO4rFuiTndlD0w4iVofKFzP7DyNA9cEjiztPlrGwlUMjl
\r
29 FB9JVgZpQnH1mQb4ROGvJBWEXtZ8mh6/hDw2ZNoXfWrQpcVFaciWKINkKYHfDKbTN4wn
\r
30 M2RhYss2/w91OcuJGRaV9hiyKsY0L5xHc8LbPTwt8S17bqt/YtG0/3xswj4Eed0k1c0d
\r
31 IqgG9isHjoP7ByMvmYq1b1wdO2WNpornDqx1Fo9BPEr2TuO8/+vVIAD6EM+rJDNs6oWA
\r
32 HhZzLrOfXlsMc+5BW+Xa/5HmOYaBrDB00/8rIv5nbGfUFZPloce2J6IzZEJxK1lMOMLe
\r
34 Received: by 10.68.196.170 with SMTP id in10mr26807241pbc.0.1353806258550;
\r
35 Sat, 24 Nov 2012 17:17:38 -0800 (PST)
\r
36 Received: from localhost (215.42.233.220.static.exetel.com.au.
\r
38 by mx.google.com with ESMTPS id ni3sm6233890pbc.2.2012.11.24.17.17.36
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Sat, 24 Nov 2012 17:17:37 -0800 (PST)
\r
41 From: Peter Wang <novalazy@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v2 06/20] insert: move file from Maildir tmp to new
\r
44 Date: Sun, 25 Nov 2012 12:16:32 +1100
\r
45 Message-Id: <1353806206-29133-7-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:41 -0000
\r
63 Atomically move the new message file from the Maildir 'tmp' directory
\r
66 notmuch-insert.c | 21 +++++++++++++++++++++
\r
67 1 file changed, 21 insertions(+)
\r
69 diff --git a/notmuch-insert.c b/notmuch-insert.c
\r
70 index 88e8533..63a04dc 100644
\r
71 --- a/notmuch-insert.c
\r
72 +++ b/notmuch-insert.c
\r
73 @@ -94,6 +94,24 @@ maildir_open_tmp_file (void *ctx, const char *dir,
\r
77 +/* Atomically move the new message file from the Maildir 'tmp' directory
\r
78 + * to the 'new' directory.
\r
80 + * We follow the Dovecot recommendation to simply use rename()
\r
81 + * instead of link() and unlink(). See also:
\r
82 + * http://wiki.dovecot.org/MailboxFormat/Maildir#Mail_delivery
\r
84 +static notmuch_bool_t
\r
85 +maildir_move_tmp_to_new (const char *tmppath, const char *newpath)
\r
87 + if (rename (tmppath, newpath) != 0) {
\r
88 + fprintf (stderr, "Error: rename() failed: %s\n", strerror (errno));
\r
95 /* Copy the contents of fdin into fdout. */
\r
96 static notmuch_bool_t
\r
97 copy_fd_data (int fdin, int fdout)
\r
98 @@ -150,6 +168,9 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
\r
100 ret = copy_fd_data (fdin, fdout);
\r
103 + ret = maildir_move_tmp_to_new (tmppath, newpath);
\r