From e5b610beffb35dc3375e643c3bc6c212297fee72 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sun, 18 Nov 2012 15:47:18 +0000 Subject: [PATCH] Re: [PATCH 03/18] insert: open Maildir tmp file --- 53/f5f6713f9e5b934e42ef5203dda4b5ae606db7 | 230 ++++++++++++++++++++++ 1 file changed, 230 insertions(+) create mode 100644 53/f5f6713f9e5b934e42ef5203dda4b5ae606db7 diff --git a/53/f5f6713f9e5b934e42ef5203dda4b5ae606db7 b/53/f5f6713f9e5b934e42ef5203dda4b5ae606db7 new file mode 100644 index 000000000..8b4b56c20 --- /dev/null +++ b/53/f5f6713f9e5b934e42ef5203dda4b5ae606db7 @@ -0,0 +1,230 @@ +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 3861D431FB6 + for ; Sun, 18 Nov 2012 07:47:28 -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 HKmpMdO4B3lI for ; + Sun, 18 Nov 2012 07:47:26 -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 43452431FAF + for ; Sun, 18 Nov 2012 07:47:26 -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 1Ta75b-0002kx-Di; Sun, 18 Nov 2012 15:47:22 +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 1Ta75a-0002B3-Vv; Sun, 18 Nov 2012 15:47:19 +0000 +From: Mark Walters +To: Peter Wang , notmuch@notmuchmail.org +Subject: Re: [PATCH 03/18] insert: open Maildir tmp file +In-Reply-To: <1343223767-9812-3-git-send-email-novalazy@gmail.com> +References: <1343223767-9812-1-git-send-email-novalazy@gmail.com> + <1343223767-9812-3-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 15:47:18 +0000 +Message-ID: <87wqxiq5fd.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: e9778cad9cbb14edb3cabe66069beb2d (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 15:47:28 -0000 + + +Hi + +I know this has been around for a long time but it still applies so I +will try and review it. I have been using it somewhat and all seems to +work. + +As an aside I have a postpone/resume implementation based on top +of it. + +One general remark is that I think more comments could be helpful. + +On Wed, 25 Jul 2012, Peter Wang wrote: +> Open a unique file in the Maildir tmp directory. +> The new message is not yet copied into the file. +> --- +> notmuch-insert.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++- +> 1 files changed, 79 insertions(+), 1 deletions(-) +> +> diff --git a/notmuch-insert.c b/notmuch-insert.c +> index 21424cf..f01a6f2 100644 +> --- a/notmuch-insert.c +> +++ b/notmuch-insert.c +> @@ -20,12 +20,86 @@ +> +> #include "notmuch-client.h" +> +> +#include +> +#include +> +#include +> + +> +static notmuch_bool_t +> +safe_gethostname (char *hostname, size_t hostname_size) +> +{ +> + if (gethostname (hostname, hostname_size) == -1) { +> + strncpy (hostname, "unknown", hostname_size); +> + } +> + hostname[hostname_size - 1] = '\0'; +> + +> + return (strchr (hostname, '/') == NULL); +> +} + +Here is an example: a comment saying "like gethostname but guarantees +that hostname is null terminated. Returns true unless hostname contains +a /. + +Also I found hostname_size a confusing term as it the size of the buffer +which is allowed to contain hostname rather than the size of +hostname. Maybe hostname_buffer_size or just len? + +> + +> +static int +> +maildir_open_tmp (void *ctx, const char *dir, char **tmppath, char **newpath) +> +{ +> + pid_t pid; +> + char hostname[256]; +> + struct timeval tv; +> + char *filename; +> + int fd = -1; +> + +> + /* This is the file name format used by Dovecot. */ +> + pid = getpid (); +> + if (! safe_gethostname (hostname, sizeof (hostname))) { +> + fprintf (stderr, "Error: invalid host name.\n"); +> + return -1; +> + } +> + gettimeofday (&tv, NULL); +> + filename = talloc_asprintf (ctx, "%ld.M%ldP%d.%s", +> + tv.tv_sec, tv.tv_usec, pid, hostname); +> + +> + *tmppath = talloc_asprintf (ctx, "%s/tmp/%s", dir, filename); + +Does there need to be rather more error checking after talloc +operations? Eg what if this allocation fails? + +> + +> + do { +> + fd = open (*tmppath, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0666); +> + } while (fd == -1 && errno == EEXIST); + +Am I misunderstanding or does this deadlock if the file *tmppath exists? +Do you want to recalculate tmppath inside the do while loop? + +Also is 0666 standard or would 0644 or 0600 be better? + +Best wishes + +Mark + +> + +> + if (fd != -1) { +> + *newpath = talloc_asprintf (ctx, "%s/new/%s", dir, filename); +> + } +> + else { +> + fprintf (stderr, "Error: opening %s: %s\n", +> + *tmppath, strerror (errno)); +> + talloc_free (*tmppath); +> + } +> + +> + talloc_free (filename); +> + +> + return fd; +> +} +> + +> +static notmuch_bool_t +> +insert_message (void *ctx, notmuch_database_t *notmuch, int fdin, +> + const char *dir) +> +{ +> + char *tmppath; +> + char *newpath; +> + int fdout; +> + +> + fdout = maildir_open_tmp (ctx, dir, &tmppath, &newpath); +> + if (fdout < 0) { +> + return FALSE; +> + } +> + +> + close (fdout); +> + unlink (tmppath); +> + return FALSE; +> +} +> + +> int +> notmuch_insert_command (void *ctx, int argc, char *argv[]) +> { +> notmuch_config_t *config; +> notmuch_database_t *notmuch; +> const char *db_path; +> + char *maildir; +> + notmuch_bool_t ret; +> +> config = notmuch_config_open (ctx, NULL, NULL); +> if (config == NULL) +> @@ -33,11 +107,15 @@ notmuch_insert_command (void *ctx, int argc, char *argv[]) +> +> db_path = notmuch_config_get_database_path (config); +> +> + maildir = talloc_asprintf (ctx, "%s", db_path); +> + +> if (notmuch_database_open (notmuch_config_get_database_path (config), +> NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much)) +> return 1; +> +> + ret = insert_message (ctx, notmuch, STDIN_FILENO, maildir); +> + +> notmuch_database_destroy (notmuch); +> +> - return 1; +> + return (ret) ? 0 : 1; +> } +> -- +> 1.7.4.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2