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 847E8431FCF
\r
6 for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:50:56 -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 2lHpYVK8R5Fc for <notmuch@notmuchmail.org>;
\r
17 Sat, 19 Jan 2013 16:50:54 -0800 (PST)
\r
18 Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com
\r
19 [209.85.220.43]) (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 BD15A429E25
\r
22 for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:50:53 -0800 (PST)
\r
23 Received: by mail-pa0-f43.google.com with SMTP id fb10so2765046pad.16
\r
24 for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:50:52 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to
\r
27 :references; bh=D4tKV9eOxoDgTpngFKtAkG37TsSOw5ZmARnrjcglmoo=;
\r
28 b=jmGyN6pAhgnP7x7/AdDcMkBsV8udAcyC01dgtTULVsgblfdIjRTU0ds8o8TOghChAw
\r
29 WTWvkeGswNlh6OWaE024FSYZyujmsAGAwRLrK5GR9KyRp717ortCg4kTF/yzK8rT+dg2
\r
30 3c91XtmWj16PNvuHzaFLUdtjzGvtl0sNADP8QSWk/6g4hH8gg7Z8H3hIuFHsTzhIDJXg
\r
31 dcLeTVeDBlY3os60sOBkmadTe1swGap29U0tQFAcVHxahPCm8BtHQvqErCJSakXsHuF7
\r
32 z2t/Nr5TZdhU7cNWItoFi2y573+SGX96zYEv0i6aNURShZHgNe0LgZ4OzPJYyHcHgRr5
\r
34 X-Received: by 10.68.238.136 with SMTP id vk8mr18491828pbc.86.1358643052901;
\r
35 Sat, 19 Jan 2013 16:50:52 -0800 (PST)
\r
36 Received: from localhost (215.42.233.220.static.exetel.com.au.
\r
38 by mx.google.com with ESMTPS id qf7sm5797734pbb.49.2013.01.19.16.50.50
\r
39 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
40 Sat, 19 Jan 2013 16:50:52 -0800 (PST)
\r
41 From: Peter Wang <novalazy@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v3 04/20] insert: move file from Maildir tmp to new
\r
44 Date: Sun, 20 Jan 2013 11:49:48 +1100
\r
45 Message-Id: <1358643004-14522-5-git-send-email-novalazy@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.12.1
\r
47 In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com>
\r
48 References: <1358643004-14522-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, 20 Jan 2013 00:50:56 -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 38e815f..c0289d9 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 standard input (fdin) into fdout. */
\r
96 static notmuch_bool_t
\r
97 copy_stdin (int fdin, int fdout)
\r
98 @@ -150,6 +168,9 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
\r
100 ret = copy_stdin (fdin, fdout);
\r
103 + ret = maildir_move_tmp_to_new (tmppath, newpath);
\r