From c90127f26d33e4e33e3458e03b3d575a60bb5b73 Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Sun, 20 Jan 2013 11:49:48 +1100 Subject: [PATCH] [PATCH v3 04/20] insert: move file from Maildir tmp to new --- 68/2b94ee49c00df67c3fd399465c3e3407fc0a0e | 110 ++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 68/2b94ee49c00df67c3fd399465c3e3407fc0a0e diff --git a/68/2b94ee49c00df67c3fd399465c3e3407fc0a0e b/68/2b94ee49c00df67c3fd399465c3e3407fc0a0e new file mode 100644 index 000000000..4017802b7 --- /dev/null +++ b/68/2b94ee49c00df67c3fd399465c3e3407fc0a0e @@ -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 847E8431FCF + for ; Sat, 19 Jan 2013 16:50:56 -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 2lHpYVK8R5Fc for ; + Sat, 19 Jan 2013 16:50:54 -0800 (PST) +Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com + [209.85.220.43]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id BD15A429E25 + for ; Sat, 19 Jan 2013 16:50:53 -0800 (PST) +Received: by mail-pa0-f43.google.com with SMTP id fb10so2765046pad.16 + for ; Sat, 19 Jan 2013 16:50:52 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to + :references; bh=D4tKV9eOxoDgTpngFKtAkG37TsSOw5ZmARnrjcglmoo=; + b=jmGyN6pAhgnP7x7/AdDcMkBsV8udAcyC01dgtTULVsgblfdIjRTU0ds8o8TOghChAw + WTWvkeGswNlh6OWaE024FSYZyujmsAGAwRLrK5GR9KyRp717ortCg4kTF/yzK8rT+dg2 + 3c91XtmWj16PNvuHzaFLUdtjzGvtl0sNADP8QSWk/6g4hH8gg7Z8H3hIuFHsTzhIDJXg + dcLeTVeDBlY3os60sOBkmadTe1swGap29U0tQFAcVHxahPCm8BtHQvqErCJSakXsHuF7 + z2t/Nr5TZdhU7cNWItoFi2y573+SGX96zYEv0i6aNURShZHgNe0LgZ4OzPJYyHcHgRr5 + 1O3Q== +X-Received: by 10.68.238.136 with SMTP id vk8mr18491828pbc.86.1358643052901; + Sat, 19 Jan 2013 16:50:52 -0800 (PST) +Received: from localhost (215.42.233.220.static.exetel.com.au. + [220.233.42.215]) + by mx.google.com with ESMTPS id qf7sm5797734pbb.49.2013.01.19.16.50.50 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 19 Jan 2013 16:50:52 -0800 (PST) +From: Peter Wang +To: notmuch@notmuchmail.org +Subject: [PATCH v3 04/20] insert: move file from Maildir tmp to new +Date: Sun, 20 Jan 2013 11:49:48 +1100 +Message-Id: <1358643004-14522-5-git-send-email-novalazy@gmail.com> +X-Mailer: git-send-email 1.7.12.1 +In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com> +References: <1358643004-14522-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, 20 Jan 2013 00:50:56 -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 38e815f..c0289d9 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 standard input (fdin) into fdout. */ + static notmuch_bool_t + copy_stdin (int fdin, int fdout) +@@ -150,6 +168,9 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin, + } + ret = copy_stdin (fdin, fdout); + close (fdout); ++ if (ret) { ++ ret = maildir_move_tmp_to_new (tmppath, newpath); ++ } + if (!ret) { + unlink (tmppath); + } +-- +1.7.12.1 + -- 2.26.2