[PATCH v3 02/20] insert: open Maildir tmp file

diff --git a/07/ff9041be9fd9106676f847c70f76828abd9fe4 b/07/ff9041be9fd9106676f847c70f76828abd9fe4
new file mode 100644 (file)
index 0000000..7e405db
--- /dev/null
+++ b/07/ff9041be9fd9106676f847c70f76828abd9fe4
@@ -0,0 +1,204 @@
+Return-Path: <novalazy@gmail.com>\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 8D931431FDA\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:50:52 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 sQzUuZa0UrhL for <notmuch@notmuchmail.org>;\r
+       Sat, 19 Jan 2013 16:50:51 -0800 (PST)\r
+Received: from mail-pa0-f47.google.com (mail-pa0-f47.google.com\r
+       [209.85.220.47]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 43BB7431FDB\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:50:44 -0800 (PST)\r
+Received: by mail-pa0-f47.google.com with SMTP id fa10so2756590pad.34\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:50:43 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+       :references; bh=jtWJ+EJNDECM7VA36hsi/3Mr+iVFnCwBd3E1VSnxHhA=;\r
+       b=kMRaa2oBjBmGlmk4eqObsvNxoh3ChaEBWov//BzhF+ofnb2h6f1RjFZhg0Zo5U7cZr\r
+       4p+aMt/ihnHlvj80JZ5V2BL4lJaOtjKcHchHD1Q3cRY+Z/5Zx2U8UIXIVhpa9p1FChhV\r
+       uapjbLtbqF97RCkIfRZqK6QgEMnmM8MbWwZlGgU7rnxb28KFJqQG7COAIjayD43k28lV\r
+       rZkcqigMlqlbxCh4bmsoUGdN19IEUq7jMRxxyTxBsH1rmlL8v/ttMHaABOfwlE9p1N2i\r
+       r6rYi24ghJnjWNooJglpWbO6KzDIZ5kYO6YpbxJDRUw5YGYN2t0epKqItX556bUXL+0g\r
+       9I1Q==\r
+X-Received: by 10.66.73.105 with SMTP id k9mr36418382pav.37.1358643043230;\r
+       Sat, 19 Jan 2013 16:50:43 -0800 (PST)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPS id vo6sm5808798pbc.8.2013.01.19.16.50.40\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 19 Jan 2013 16:50:42 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 02/20] insert: open Maildir tmp file\r
+Date: Sun, 20 Jan 2013 11:49:46 +1100\r
+Message-Id: <1358643004-14522-3-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com>\r
+References: <1358643004-14522-1-git-send-email-novalazy@gmail.com>\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, 20 Jan 2013 00:50:53 -0000\r
+\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 | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-\r
+ 1 file changed, 104 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index c1d359c..7d100ae 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -20,12 +20,107 @@\r
+ \r
+ #include "notmuch-client.h"\r
+ \r
++#include <sys/types.h>\r
++#include <sys/stat.h>\r
++#include <fcntl.h>\r
++\r
++/* Like gethostname but guarantees that a null-terminated hostname is\r
++ * returned, even if it has to make one up.\r
++ * Returns true unless hostname contains a slash. */\r
++static notmuch_bool_t\r
++safe_gethostname (char *hostname, size_t len)\r
++{\r
++    if (gethostname (hostname, len) == -1) {\r
++      strncpy (hostname, "unknown", len);\r
++    }\r
++    hostname[len - 1] = '\0';\r
++\r
++    return (strchr (hostname, '/') == NULL);\r
++}\r
++\r
++/* Open a unique file in the Maildir 'tmp' directory.\r
++ * Returns the file descriptor on success, or -1 on failure.\r
++ * On success, file paths for the message in the 'tmp' and 'new'\r
++ * directories are returned via tmppath and newpath. */\r
++static int\r
++maildir_open_tmp_file (void *ctx, const char *dir,\r
++                     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
++    /* We follow the Dovecot file name generation algorithm. */\r
++    pid = getpid ();\r
++    if (! safe_gethostname (hostname, sizeof (hostname))) {\r
++      fprintf (stderr, "Error: invalid host name.\n");\r
++      return -1;\r
++    }\r
++    do {\r
++      gettimeofday (&tv, NULL);\r
++      filename = talloc_asprintf (ctx, "%ld.M%ldP%d.%s",\r
++                                  tv.tv_sec, tv.tv_usec, pid, hostname);\r
++      if (! filename) {\r
++          fprintf (stderr, "Out of memory\n");\r
++          return -1;\r
++      }\r
++\r
++      *tmppath = talloc_asprintf (ctx, "%s/tmp/%s", dir, filename);\r
++      if (! *tmppath) {\r
++          fprintf (stderr, "Out of memory\n");\r
++          return -1;\r
++      }\r
++\r
++      fd = open (*tmppath, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600);\r
++    } while (fd == -1 && errno == EEXIST);\r
++\r
++    if (fd == -1) {\r
++      fprintf (stderr, "Error: opening %s: %s\n", *tmppath, strerror (errno));\r
++      return -1;\r
++    }\r
++\r
++    *newpath = talloc_asprintf (ctx, "%s/new/%s", dir, filename);\r
++    if (! *newpath) {\r
++      fprintf (stderr, "Out of memory\n");\r
++      close (fd);\r
++      unlink (*tmppath);\r
++      return -1;\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_file (ctx, dir, &tmppath, &newpath);\r
++    if (fdout < 0) {\r
++      return FALSE;\r
++    }\r
++\r
++    /* For now we just delete the tmp file immediately. */\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 +128,19 @@ 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
++    if (! maildir) {\r
++      fprintf (stderr, "Out of memory\n");\r
++      return 1;\r
++    }\r
++\r
+     if (notmuch_database_open (notmuch_config_get_database_path (config),\r
+                              NOTMUCH_DATABASE_MODE_READ_WRITE, &notmuch))\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.12.1\r
+\r