[PATCH 03/18] insert: open Maildir tmp file

diff --git a/37/6d80b47ac768451587779541ddc4fd7f7f257c b/37/6d80b47ac768451587779541ddc4fd7f7f257c
new file mode 100644 (file)
index 0000000..24a47ef
--- /dev/null
+++ b/37/6d80b47ac768451587779541ddc4fd7f7f257c
@@ -0,0 +1,179 @@
+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 13AAB431FCF\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:30 -0700 (PDT)\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 8ZgnZp9Nhj+8 for <notmuch@notmuchmail.org>;\r
+       Wed, 25 Jul 2012 06:43:28 -0700 (PDT)\r
+Received: from mail-gg0-f181.google.com (mail-gg0-f181.google.com\r
+       [209.85.161.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 7D8B2431FC7\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:26 -0700 (PDT)\r
+Received: by mail-gg0-f181.google.com with SMTP id v5so882427ggn.26\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:26 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=HVSIbOtlhADhGBcZWSsAP2oPF/SCdkQEIwlYnzC5hKY=;\r
+       b=vWRdJmOgy+uTazJ9x0s2DmAQhQJUQVUpO6imeCrMg9NoqX/9Ql304RLYGi6SmOI9ka\r
+       tElyXTM9gV2sXc7/sovqFJrU7BEQ70P5sDhCxWHvBekOs1bwIMkAcXYcoOxUuY11M5Pv\r
+       YUlaLn5PsIe83i8ZXf4vBiVNVqNnDK1JbgiUAFr7nfvGrNV8SSRneAETIFzACKw6pH3E\r
+       v7G/1gbmJZSIVz7hTOz1D+Gz1Bgm5pGWKH0/Xsh17SbRYAlD2OFX6w99BIhO/6eIlSEn\r
+       UVS7aahngtp1I9HQKesf++5joefSIWyCt67pD+ZwcCFZD/TjS1grOUWgE/glIAIYtWdR\r
+       Iwag==\r
+Received: by 10.66.73.202 with SMTP id n10mr12776437pav.80.1343223805948;\r
+       Wed, 25 Jul 2012 06:43:25 -0700 (PDT)\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 sk5sm14419691pbc.7.2012.07.25.06.43.23\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 25 Jul 2012 06:43:25 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 03/18] insert: open Maildir tmp file\r
+Date: Wed, 25 Jul 2012 23:42:32 +1000\r
+Message-Id: <1343223767-9812-3-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.4.4\r
+In-Reply-To: <1343223767-9812-1-git-send-email-novalazy@gmail.com>\r
+References: <1343223767-9812-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: Wed, 25 Jul 2012 13:43:30 -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 |   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
++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
++    do {\r
++      fd = open (*tmppath, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0666);\r
++    } while (fd == -1 && errno == EEXIST);\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, &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.4.4\r
+\r