From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 64F50431FDC for ; Wed, 16 Apr 2014 06:00:43 -0700 (PDT) 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 agypQVppRV2o for ; Wed, 16 Apr 2014 06:00:36 -0700 (PDT) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id CC304431FDE for ; Wed, 16 Apr 2014 06:00:08 -0700 (PDT) Received: by mail-pa0-f42.google.com with SMTP id fb1so10923726pad.15 for ; Wed, 16 Apr 2014 06:00:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+HXB+LTFJM7wRO+0IUZtPIGOPE0vuuNVAiMcp6D0URY=; b=xwFlwQtDx3+GR7nzOj50kSJpSQe9T4LCfBtxVQt5ffcLhrogq/uxmEr++0zCr0EjMb uWW9NTCQbI0H2K6mDTVkiC2QYe4J1G9dwGXfHK8OT67Ipx7vNzPD4WBRJh5kSiT5hdNz rChslUwKHAUGCHYWur8gxtpfXFJRXyL/vtXY3NHBtsfeVlZhInAjCBKYM4lzwtwRLbni qMMjZvdOr7IRi9FJl8291ZfDUwiZHxW0ehi7j1Ekzso16uC0fGZ6ze7G2Blnh+ayvbuM offBDzj48qvBeQcINLgVDlTaWatbUXazOgM1UejLnFRSl8ADB2Q9dIM6Hor++XX25dW+ sGMA== X-Received: by 10.68.143.196 with SMTP id sg4mr8185642pbb.155.1397653208034; Wed, 16 Apr 2014 06:00:08 -0700 (PDT) Received: from localhost (215.42.233.220.static.exetel.com.au. [220.233.42.215]) by mx.google.com with ESMTPSA id hw8sm46903968pbc.62.2014.04.16.06.00.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Apr 2014 06:00:07 -0700 (PDT) From: Peter Wang To: notmuch@notmuchmail.org Subject: [PATCH v2 06/10] cli: refactor insert Date: Wed, 16 Apr 2014 22:59:21 +1000 Message-Id: <1397653165-15620-7-git-send-email-novalazy@gmail.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1397653165-15620-1-git-send-email-novalazy@gmail.com> References: <1397653165-15620-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: Wed, 16 Apr 2014 13:00:43 -0000 Change insert_message into write_message and move its responsibilities for indexing the message into the main function, to simplify the control flow. --- notmuch-insert.c | 63 +++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/notmuch-insert.c b/notmuch-insert.c index 6752fc8..7db4f73 100644 --- a/notmuch-insert.c +++ b/notmuch-insert.c @@ -338,59 +338,48 @@ add_file_to_database (notmuch_database_t *notmuch, const char *path, } static notmuch_bool_t -insert_message (void *ctx, notmuch_database_t *notmuch, int fdin, - const char *dir, tag_op_list_t *tag_ops, - notmuch_bool_t synchronize_flags) +write_message (void *ctx, int fdin, const char *dir, char **newpath) { char *tmppath; - char *newpath; char *newdir; int fdout; - char *cleanup_path; - fdout = maildir_open_tmp_file (ctx, dir, &tmppath, &newpath, &newdir); + fdout = maildir_open_tmp_file (ctx, dir, &tmppath, newpath, &newdir); if (fdout < 0) return FALSE; - cleanup_path = tmppath; - - if (! copy_stdin (fdin, fdout)) - goto FAIL; + if (! copy_stdin (fdin, fdout)) { + close (fdout); + unlink (tmppath); + return FALSE; + } if (fsync (fdout) != 0) { fprintf (stderr, "Error: fsync failed: %s\n", strerror (errno)); - goto FAIL; + close (fdout); + unlink (tmppath); + return FALSE; } close (fdout); - fdout = -1; /* 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 */ - if (rename (tmppath, newpath) != 0) { + if (rename (tmppath, *newpath) != 0) { fprintf (stderr, "Error: rename() failed: %s\n", strerror (errno)); - goto FAIL; + unlink (tmppath); + return FALSE; } - cleanup_path = newpath; - - if (! sync_dir (newdir)) - goto FAIL; - - /* Even if adding the message to the notmuch database fails, - * the message is on disk and we consider the delivery completed. */ - add_file_to_database (notmuch, newpath, tag_ops, synchronize_flags); + if (! sync_dir (newdir)) { + unlink (*newpath); + return FALSE; + } return TRUE; - - FAIL: - if (fdout >= 0) - close (fdout); - unlink (cleanup_path); - return FALSE; } int @@ -407,9 +396,9 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[]) notmuch_bool_t create_folder = FALSE; notmuch_bool_t synchronize_flags; const char *maildir; + char *newpath; int opt_index; unsigned int i; - notmuch_bool_t ret; notmuch_opt_desc_t options[] = { { NOTMUCH_OPT_STRING, &folder, "folder", 0, 0 }, @@ -484,10 +473,18 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[]) NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much)) return EXIT_FAILURE; - ret = insert_message (config, notmuch, STDIN_FILENO, maildir, tag_ops, - synchronize_flags); + /* Write the message to the Maildir new directory. */ + if (! write_message (config, STDIN_FILENO, maildir, &newpath)) { + notmuch_database_destroy (notmuch); + return EXIT_FAILURE; + } - notmuch_database_destroy (notmuch); + /* Add the message to the index. + * Even if adding the message to the notmuch database fails, + * the message is on disk and we consider the delivery completed. */ + add_file_to_database (notmuch, newpath, tag_ops, + synchronize_flags); - return ret ? EXIT_SUCCESS : EXIT_FAILURE; + notmuch_database_destroy (notmuch); + return EXIT_SUCCESS; } -- 1.8.4