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