1 Return-Path: <novalazy@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 13AAB431FCF
\r
6 for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:30 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id 8ZgnZp9Nhj+8 for <notmuch@notmuchmail.org>;
\r
17 Wed, 25 Jul 2012 06:43:28 -0700 (PDT)
\r
18 Received: from mail-gg0-f181.google.com (mail-gg0-f181.google.com
\r
19 [209.85.161.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 7D8B2431FC7
\r
22 for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:26 -0700 (PDT)
\r
23 Received: by mail-gg0-f181.google.com with SMTP id v5so882427ggn.26
\r
24 for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:26 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
27 bh=HVSIbOtlhADhGBcZWSsAP2oPF/SCdkQEIwlYnzC5hKY=;
\r
28 b=vWRdJmOgy+uTazJ9x0s2DmAQhQJUQVUpO6imeCrMg9NoqX/9Ql304RLYGi6SmOI9ka
\r
29 tElyXTM9gV2sXc7/sovqFJrU7BEQ70P5sDhCxWHvBekOs1bwIMkAcXYcoOxUuY11M5Pv
\r
30 YUlaLn5PsIe83i8ZXf4vBiVNVqNnDK1JbgiUAFr7nfvGrNV8SSRneAETIFzACKw6pH3E
\r
31 v7G/1gbmJZSIVz7hTOz1D+Gz1Bgm5pGWKH0/Xsh17SbRYAlD2OFX6w99BIhO/6eIlSEn
\r
32 UVS7aahngtp1I9HQKesf++5joefSIWyCt67pD+ZwcCFZD/TjS1grOUWgE/glIAIYtWdR
\r
34 Received: by 10.66.73.202 with SMTP id n10mr12776437pav.80.1343223805948;
\r
35 Wed, 25 Jul 2012 06:43:25 -0700 (PDT)
\r
36 Received: from localhost (215.42.233.220.static.exetel.com.au.
\r
38 by mx.google.com with ESMTPS id sk5sm14419691pbc.7.2012.07.25.06.43.23
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Wed, 25 Jul 2012 06:43:25 -0700 (PDT)
\r
41 From: Peter Wang <novalazy@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH 03/18] insert: open Maildir tmp file
\r
44 Date: Wed, 25 Jul 2012 23:42:32 +1000
\r
45 Message-Id: <1343223767-9812-3-git-send-email-novalazy@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.4.4
\r
47 In-Reply-To: <1343223767-9812-1-git-send-email-novalazy@gmail.com>
\r
48 References: <1343223767-9812-1-git-send-email-novalazy@gmail.com>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Wed, 25 Jul 2012 13:43:30 -0000
\r
63 Open a unique file in the Maildir tmp directory.
\r
64 The new message is not yet copied into the file.
\r
66 notmuch-insert.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
\r
67 1 files changed, 79 insertions(+), 1 deletions(-)
\r
69 diff --git a/notmuch-insert.c b/notmuch-insert.c
\r
70 index 21424cf..f01a6f2 100644
\r
71 --- a/notmuch-insert.c
\r
72 +++ b/notmuch-insert.c
\r
75 #include "notmuch-client.h"
\r
77 +#include <sys/types.h>
\r
78 +#include <sys/stat.h>
\r
81 +static notmuch_bool_t
\r
82 +safe_gethostname (char *hostname, size_t hostname_size)
\r
84 + if (gethostname (hostname, hostname_size) == -1) {
\r
85 + strncpy (hostname, "unknown", hostname_size);
\r
87 + hostname[hostname_size - 1] = '\0';
\r
89 + return (strchr (hostname, '/') == NULL);
\r
93 +maildir_open_tmp (void *ctx, const char *dir, char **tmppath, char **newpath)
\r
96 + char hostname[256];
\r
97 + struct timeval tv;
\r
101 + /* This is the file name format used by Dovecot. */
\r
103 + if (! safe_gethostname (hostname, sizeof (hostname))) {
\r
104 + fprintf (stderr, "Error: invalid host name.\n");
\r
107 + gettimeofday (&tv, NULL);
\r
108 + filename = talloc_asprintf (ctx, "%ld.M%ldP%d.%s",
\r
109 + tv.tv_sec, tv.tv_usec, pid, hostname);
\r
111 + *tmppath = talloc_asprintf (ctx, "%s/tmp/%s", dir, filename);
\r
114 + fd = open (*tmppath, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0666);
\r
115 + } while (fd == -1 && errno == EEXIST);
\r
118 + *newpath = talloc_asprintf (ctx, "%s/new/%s", dir, filename);
\r
121 + fprintf (stderr, "Error: opening %s: %s\n",
\r
122 + *tmppath, strerror (errno));
\r
123 + talloc_free (*tmppath);
\r
126 + talloc_free (filename);
\r
131 +static notmuch_bool_t
\r
132 +insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
\r
139 + fdout = maildir_open_tmp (ctx, dir, &tmppath, &newpath);
\r
145 + unlink (tmppath);
\r
150 notmuch_insert_command (void *ctx, int argc, char *argv[])
\r
152 notmuch_config_t *config;
\r
153 notmuch_database_t *notmuch;
\r
154 const char *db_path;
\r
156 + notmuch_bool_t ret;
\r
158 config = notmuch_config_open (ctx, NULL, NULL);
\r
159 if (config == NULL)
\r
160 @@ -33,11 +107,15 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
\r
162 db_path = notmuch_config_get_database_path (config);
\r
164 + maildir = talloc_asprintf (ctx, "%s", db_path);
\r
166 if (notmuch_database_open (notmuch_config_get_database_path (config),
\r
167 NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much))
\r
170 + ret = insert_message (ctx, notmuch, STDIN_FILENO, maildir);
\r
172 notmuch_database_destroy (notmuch);
\r
175 + return (ret) ? 0 : 1;
\r