From: Peter Wang Date: Sun, 25 Nov 2012 01:16:32 +0000 (+1100) Subject: [PATCH v2 06/20] insert: move file from Maildir tmp to new X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1caacc47c47d5870a922316d0f56034d9a88502a;p=notmuch-archives.git [PATCH v2 06/20] insert: move file from Maildir tmp to new --- diff --git a/84/8c585ffd63d8825afdca99752fb36c6d8f4fce b/84/8c585ffd63d8825afdca99752fb36c6d8f4fce new file mode 100644 index 000000000..5f6e3ea8b --- /dev/null +++ b/84/8c585ffd63d8825afdca99752fb36c6d8f4fce @@ -0,0 +1,110 @@ +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 1DFDF431FAF + for ; Sat, 24 Nov 2012 17:17:41 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 N3fB0DDv-kdm for ; + Sat, 24 Nov 2012 17:17:39 -0800 (PST) +Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com + [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 02809431FAE + for ; Sat, 24 Nov 2012 17:17:38 -0800 (PST) +Received: by mail-pb0-f53.google.com with SMTP id jt11so7944513pbb.26 + for ; Sat, 24 Nov 2012 17:17:38 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=/5WC3yqOeQYw9GDHmPQJR+fWU4YUCc3fNiKr1yk5FB0=; + b=tasuYoiyG7UxLKUVRaVHiiO4rFuiTndlD0w4iVofKFzP7DyNA9cEjiztPlrGwlUMjl + FB9JVgZpQnH1mQb4ROGvJBWEXtZ8mh6/hDw2ZNoXfWrQpcVFaciWKINkKYHfDKbTN4wn + M2RhYss2/w91OcuJGRaV9hiyKsY0L5xHc8LbPTwt8S17bqt/YtG0/3xswj4Eed0k1c0d + IqgG9isHjoP7ByMvmYq1b1wdO2WNpornDqx1Fo9BPEr2TuO8/+vVIAD6EM+rJDNs6oWA + HhZzLrOfXlsMc+5BW+Xa/5HmOYaBrDB00/8rIv5nbGfUFZPloce2J6IzZEJxK1lMOMLe + bvmw== +Received: by 10.68.196.170 with SMTP id in10mr26807241pbc.0.1353806258550; + Sat, 24 Nov 2012 17:17:38 -0800 (PST) +Received: from localhost (215.42.233.220.static.exetel.com.au. + [220.233.42.215]) + by mx.google.com with ESMTPS id ni3sm6233890pbc.2.2012.11.24.17.17.36 + (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 24 Nov 2012 17:17:37 -0800 (PST) +From: Peter Wang +To: notmuch@notmuchmail.org +Subject: [PATCH v2 06/20] insert: move file from Maildir tmp to new +Date: Sun, 25 Nov 2012 12:16:32 +1100 +Message-Id: <1353806206-29133-7-git-send-email-novalazy@gmail.com> +X-Mailer: git-send-email 1.7.12.1 +In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com> +References: <1353806206-29133-1-git-send-email-novalazy@gmail.com> +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, 25 Nov 2012 01:17:41 -0000 + +Atomically move the new message file from the Maildir 'tmp' directory +to 'new'. +--- + notmuch-insert.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/notmuch-insert.c b/notmuch-insert.c +index 88e8533..63a04dc 100644 +--- a/notmuch-insert.c ++++ b/notmuch-insert.c +@@ -94,6 +94,24 @@ maildir_open_tmp_file (void *ctx, const char *dir, + return fd; + } + ++/* Atomically move the new message file from the Maildir 'tmp' directory ++ * to the 'new' directory. ++ * ++ * We follow the Dovecot recommendation to simply use rename() ++ * instead of link() and unlink(). See also: ++ * http://wiki.dovecot.org/MailboxFormat/Maildir#Mail_delivery ++ */ ++static notmuch_bool_t ++maildir_move_tmp_to_new (const char *tmppath, const char *newpath) ++{ ++ if (rename (tmppath, newpath) != 0) { ++ fprintf (stderr, "Error: rename() failed: %s\n", strerror (errno)); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ + /* Copy the contents of fdin into fdout. */ + static notmuch_bool_t + copy_fd_data (int fdin, int fdout) +@@ -150,6 +168,9 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin, + } + ret = copy_fd_data (fdin, fdout); + close (fdout); ++ if (ret) { ++ ret = maildir_move_tmp_to_new (tmppath, newpath); ++ } + if (!ret) { + unlink (tmppath); + } +-- +1.7.12.1 +