[PATCH v2 06/20] insert: move file from Maildir tmp to new

diff --git a/84/8c585ffd63d8825afdca99752fb36c6d8f4fce b/84/8c585ffd63d8825afdca99752fb36c6d8f4fce
new file mode 100644 (file)
index 0000000..5f6e3ea
--- /dev/null
+++ b/84/8c585ffd63d8825afdca99752fb36c6d8f4fce
@@ -0,0 +1,110 @@
+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 1DFDF431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:41 -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 N3fB0DDv-kdm for <notmuch@notmuchmail.org>;\r
+       Sat, 24 Nov 2012 17:17:39 -0800 (PST)\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 02809431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:38 -0800 (PST)\r
+Received: by mail-pb0-f53.google.com with SMTP id jt11so7944513pbb.26\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:38 -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=/5WC3yqOeQYw9GDHmPQJR+fWU4YUCc3fNiKr1yk5FB0=;\r
+       b=tasuYoiyG7UxLKUVRaVHiiO4rFuiTndlD0w4iVofKFzP7DyNA9cEjiztPlrGwlUMjl\r
+       FB9JVgZpQnH1mQb4ROGvJBWEXtZ8mh6/hDw2ZNoXfWrQpcVFaciWKINkKYHfDKbTN4wn\r
+       M2RhYss2/w91OcuJGRaV9hiyKsY0L5xHc8LbPTwt8S17bqt/YtG0/3xswj4Eed0k1c0d\r
+       IqgG9isHjoP7ByMvmYq1b1wdO2WNpornDqx1Fo9BPEr2TuO8/+vVIAD6EM+rJDNs6oWA\r
+       HhZzLrOfXlsMc+5BW+Xa/5HmOYaBrDB00/8rIv5nbGfUFZPloce2J6IzZEJxK1lMOMLe\r
+       bvmw==\r
+Received: by 10.68.196.170 with SMTP id in10mr26807241pbc.0.1353806258550;\r
+       Sat, 24 Nov 2012 17:17:38 -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 ni3sm6233890pbc.2.2012.11.24.17.17.36\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 24 Nov 2012 17:17:37 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 06/20] insert: move file from Maildir tmp to new\r
+Date: Sun, 25 Nov 2012 12:16:32 +1100\r
+Message-Id: <1353806206-29133-7-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:41 -0000\r
+\r
+Atomically move the new message file from the Maildir 'tmp' directory\r
+to 'new'.\r
+---\r
+ notmuch-insert.c | 21 +++++++++++++++++++++\r
+ 1 file changed, 21 insertions(+)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 88e8533..63a04dc 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -94,6 +94,24 @@ maildir_open_tmp_file (void *ctx, const char *dir,\r
+     return fd;\r
+ }\r
+ \r
++/* Atomically move the new message file from the Maildir 'tmp' directory\r
++ * to the 'new' directory.\r
++ *\r
++ * We follow the Dovecot recommendation to simply use rename()\r
++ * instead of link() and unlink().  See also:\r
++ * http://wiki.dovecot.org/MailboxFormat/Maildir#Mail_delivery\r
++ */\r
++static notmuch_bool_t\r
++maildir_move_tmp_to_new (const char *tmppath, const char *newpath)\r
++{\r
++    if (rename (tmppath, newpath) != 0) {\r
++      fprintf (stderr, "Error: rename() failed: %s\n", strerror (errno));\r
++      return FALSE;\r
++    }\r
++\r
++    return TRUE;\r
++}\r
++\r
+ /* Copy the contents of fdin into fdout. */\r
+ static notmuch_bool_t\r
+ copy_fd_data (int fdin, int fdout)\r
+@@ -150,6 +168,9 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+     }\r
+     ret = copy_fd_data (fdin, fdout);\r
+     close (fdout);\r
++    if (ret) {\r
++      ret = maildir_move_tmp_to_new (tmppath, newpath);\r
++    }\r
+     if (!ret) {\r
+       unlink (tmppath);\r
+     }\r
+-- \r
+1.7.12.1\r
+\r