--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 3861D431FB6\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Nov 2012 07:47:28 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id HKmpMdO4B3lI for <notmuch@notmuchmail.org>;\r
+ Sun, 18 Nov 2012 07:47:26 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 43452431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Nov 2012 07:47:26 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Ta75b-0002kx-Di; Sun, 18 Nov 2012 15:47:22 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Ta75a-0002B3-Vv; Sun, 18 Nov 2012 15:47:19 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 03/18] insert: open Maildir tmp file\r
+In-Reply-To: <1343223767-9812-3-git-send-email-novalazy@gmail.com>\r
+References: <1343223767-9812-1-git-send-email-novalazy@gmail.com>\r
+ <1343223767-9812-3-git-send-email-novalazy@gmail.com>\r
+User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 18 Nov 2012 15:47:18 +0000\r
+Message-ID: <87wqxiq5fd.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: e9778cad9cbb14edb3cabe66069beb2d (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 18 Nov 2012 15:47:28 -0000\r
+\r
+\r
+Hi\r
+\r
+I know this has been around for a long time but it still applies so I\r
+will try and review it. I have been using it somewhat and all seems to\r
+work.\r
+\r
+As an aside I have a postpone/resume implementation based on top\r
+of it.\r
+\r
+One general remark is that I think more comments could be helpful.\r
+\r
+On Wed, 25 Jul 2012, Peter Wang <novalazy@gmail.com> wrote:\r
+> Open a unique file in the Maildir tmp directory.\r
+> The new message is not yet copied into the file.\r
+> ---\r
+> notmuch-insert.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++-\r
+> 1 files changed, 79 insertions(+), 1 deletions(-)\r
+>\r
+> diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+> index 21424cf..f01a6f2 100644\r
+> --- a/notmuch-insert.c\r
+> +++ b/notmuch-insert.c\r
+> @@ -20,12 +20,86 @@\r
+> \r
+> #include "notmuch-client.h"\r
+> \r
+> +#include <sys/types.h>\r
+> +#include <sys/stat.h>\r
+> +#include <fcntl.h>\r
+> +\r
+> +static notmuch_bool_t\r
+> +safe_gethostname (char *hostname, size_t hostname_size)\r
+> +{\r
+> + if (gethostname (hostname, hostname_size) == -1) {\r
+> + strncpy (hostname, "unknown", hostname_size);\r
+> + }\r
+> + hostname[hostname_size - 1] = '\0';\r
+> +\r
+> + return (strchr (hostname, '/') == NULL);\r
+> +}\r
+\r
+Here is an example: a comment saying "like gethostname but guarantees\r
+that hostname is null terminated. Returns true unless hostname contains\r
+a /. \r
+\r
+Also I found hostname_size a confusing term as it the size of the buffer\r
+which is allowed to contain hostname rather than the size of\r
+hostname. Maybe hostname_buffer_size or just len?\r
+\r
+> +\r
+> +static int\r
+> +maildir_open_tmp (void *ctx, const char *dir, char **tmppath, char **newpath)\r
+> +{\r
+> + pid_t pid;\r
+> + char hostname[256];\r
+> + struct timeval tv;\r
+> + char *filename;\r
+> + int fd = -1;\r
+> +\r
+> + /* This is the file name format used by Dovecot. */\r
+> + pid = getpid ();\r
+> + if (! safe_gethostname (hostname, sizeof (hostname))) {\r
+> + fprintf (stderr, "Error: invalid host name.\n");\r
+> + return -1;\r
+> + }\r
+> + gettimeofday (&tv, NULL);\r
+> + filename = talloc_asprintf (ctx, "%ld.M%ldP%d.%s",\r
+> + tv.tv_sec, tv.tv_usec, pid, hostname);\r
+> +\r
+> + *tmppath = talloc_asprintf (ctx, "%s/tmp/%s", dir, filename);\r
+\r
+Does there need to be rather more error checking after talloc\r
+operations? Eg what if this allocation fails?\r
+\r
+> +\r
+> + do {\r
+> + fd = open (*tmppath, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0666);\r
+> + } while (fd == -1 && errno == EEXIST);\r
+\r
+Am I misunderstanding or does this deadlock if the file *tmppath exists?\r
+Do you want to recalculate tmppath inside the do while loop?\r
+\r
+Also is 0666 standard or would 0644 or 0600 be better?\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+> +\r
+> + if (fd != -1) {\r
+> + *newpath = talloc_asprintf (ctx, "%s/new/%s", dir, filename);\r
+> + }\r
+> + else {\r
+> + fprintf (stderr, "Error: opening %s: %s\n",\r
+> + *tmppath, strerror (errno));\r
+> + talloc_free (*tmppath);\r
+> + }\r
+> +\r
+> + talloc_free (filename);\r
+> +\r
+> + return fd;\r
+> +}\r
+> +\r
+> +static notmuch_bool_t\r
+> +insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+> + const char *dir)\r
+> +{\r
+> + char *tmppath;\r
+> + char *newpath;\r
+> + int fdout;\r
+> +\r
+> + fdout = maildir_open_tmp (ctx, dir, &tmppath, &newpath);\r
+> + if (fdout < 0) {\r
+> + return FALSE;\r
+> + }\r
+> +\r
+> + close (fdout);\r
+> + unlink (tmppath);\r
+> + return FALSE;\r
+> +}\r
+> +\r
+> int\r
+> notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+> {\r
+> notmuch_config_t *config;\r
+> notmuch_database_t *notmuch;\r
+> const char *db_path;\r
+> + char *maildir;\r
+> + notmuch_bool_t ret;\r
+> \r
+> config = notmuch_config_open (ctx, NULL, NULL);\r
+> if (config == NULL)\r
+> @@ -33,11 +107,15 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+> \r
+> db_path = notmuch_config_get_database_path (config);\r
+> \r
+> + maildir = talloc_asprintf (ctx, "%s", db_path);\r
+> +\r
+> if (notmuch_database_open (notmuch_config_get_database_path (config),\r
+> NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much))\r
+> return 1;\r
+> \r
+> + ret = insert_message (ctx, notmuch, STDIN_FILENO, maildir);\r
+> +\r
+> notmuch_database_destroy (notmuch);\r
+> \r
+> - return 1;\r
+> + return (ret) ? 0 : 1;\r
+> }\r
+> -- \r
+> 1.7.4.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff