--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 413F6431FB6\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Nov 2012 09:33:50 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 XTeGTcmVfnUs for <notmuch@notmuchmail.org>;\r
+ Sun, 18 Nov 2012 09:33:49 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 9DF11431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Nov 2012 09:33:49 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Ta8kd-0005IY-RW; Sun, 18 Nov 2012 17:33:48 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Ta8kd-0003v9-H9; Sun, 18 Nov 2012 17:33:47 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 05/18] insert: move file from Maildir tmp to new\r
+In-Reply-To: <1343223767-9812-5-git-send-email-novalazy@gmail.com>\r
+References: <1343223767-9812-1-git-send-email-novalazy@gmail.com>\r
+ <1343223767-9812-5-git-send-email-novalazy@gmail.com>\r
+User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 18 Nov 2012 17:33:46 +0000\r
+Message-ID: <87haomq0hx.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: c96fb93cd9072194f917a485709869ec (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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, 18 Nov 2012 17:33:50 -0000\r
+\r
+On Wed, 25 Jul 2012, Peter Wang <novalazy@gmail.com> wrote:\r
+> Atomically move the new message file from the Maildir 'tmp' directory\r
+> to 'new'.\r
+> ---\r
+> notmuch-insert.c | 18 ++++++++++++++++++\r
+> 1 files changed, 18 insertions(+), 0 deletions(-)\r
+>\r
+> diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+> index 340f7e4..bab1fed 100644\r
+> --- a/notmuch-insert.c\r
+> +++ b/notmuch-insert.c\r
+> @@ -75,6 +75,20 @@ maildir_open_tmp (void *ctx, const char *dir, char **tmppath, char **newpath)\r
+> }\r
+> \r
+> static notmuch_bool_t\r
+> +maildir_move_to_new (const char *tmppath, const char *newpath)\r
+> +{\r
+> + /* We follow the Dovecot recommendation to simply use rename()\r
+> + * instead of link() and unlink().\r
+> + */\r
+> + if (rename (tmppath, newpath) == 0) {\r
+> + return TRUE;\r
+> + }\r
+\r
+Do we want to overwrite an existing message with this name? As far as I\r
+can see rename does overwrite and link would not: was that why rename is\r
+better than link/unlink?\r
+\r
+I would prefer not to overwrite but maybe there is a reason we need to. \r
+Would a possible alternative be to loop when finding a tmp file until\r
+both the tmp file and the new file do not exist?\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+> +\r
+> + fprintf (stderr, "Error: rename() failed: %s\n", strerror (errno));\r
+> + return FALSE;\r
+> +}\r
+> +\r
+> +static notmuch_bool_t\r
+> copy_fd_data (int fdin, int fdout)\r
+> {\r
+> char buf[4096];\r
+> @@ -132,6 +146,10 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+> \r
+> close (fdout);\r
+> \r
+> + if (ret) {\r
+> + ret = maildir_move_to_new (tmppath, newpath);\r
+> + }\r
+> +\r
+> if (!ret) {\r
+> unlink (tmppath);\r
+> }\r
+> -- \r
+> 1.7.4.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff