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 89019431FAF
\r
6 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:50 -0800 (PST)
\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 Spwe83tBZSwW for <notmuch@notmuchmail.org>;
\r
17 Sat, 24 Nov 2012 17:17:50 -0800 (PST)
\r
18 Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com
\r
19 [209.85.220.53]) (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 0B80C431FAE
\r
22 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:49 -0800 (PST)
\r
23 Received: by mail-pa0-f53.google.com with SMTP id hz1so3911431pad.26
\r
24 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:49 -0800 (PST)
\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=2NE0FXGC1i2630ICDz8Yy4v0touNs4MaQ4U3C/nmWT8=;
\r
28 b=YkkKI2mSr1s9bD4PLK5tQJb4lwhiY5WdrWbI9P7UWqMlF1aBw3BRZ7fjyU/S1v2PgR
\r
29 2VoU8h93Z2oGSfCWq3dDfRlExNEzyGMnNTIeauAnLioyvqcuRbWXYJm3M0GChcrBDV+T
\r
30 9q0VseBVs5kyN+FNDjq4EFXfr2AcHtQPJswpx/A7rSNHRoxc3vVl8zuNJ2gXySO7A0/7
\r
31 yyo4wWKkE17z1boiXlNxqV5ZGjUtOjfSPmnBYR8sz7QLcpLyhyYqMh/DrC1/TkZWZNru
\r
32 vm4jH5rywB+Kosytoiq2cBO16F1yM82Wx6xMWE4n/i99Q7oIGFqQ7AomH7w19UvcPGCI
\r
34 Received: by 10.68.135.101 with SMTP id pr5mr26127731pbb.140.1353806269801;
\r
35 Sat, 24 Nov 2012 17:17:49 -0800 (PST)
\r
36 Received: from localhost (215.42.233.220.static.exetel.com.au.
\r
38 by mx.google.com with ESMTPS id mz10sm6225942pbc.37.2012.11.24.17.17.47
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Sat, 24 Nov 2012 17:17:49 -0800 (PST)
\r
41 From: Peter Wang <novalazy@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v2 08/20] insert: support --folder option
\r
44 Date: Sun, 25 Nov 2012 12:16:34 +1100
\r
45 Message-Id: <1353806206-29133-9-git-send-email-novalazy@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.12.1
\r
47 In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com>
\r
48 References: <1353806206-29133-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: Sun, 25 Nov 2012 01:17:50 -0000
\r
63 Allow the new message to be inserted into a folder within the Maildir
\r
64 hierarchy instead of the top-level folder.
\r
66 notmuch-insert.c | 21 ++++++++++++++++++++-
\r
67 1 file changed, 20 insertions(+), 1 deletion(-)
\r
69 diff --git a/notmuch-insert.c b/notmuch-insert.c
\r
70 index 020dc29..a50eacc 100644
\r
71 --- a/notmuch-insert.c
\r
72 +++ b/notmuch-insert.c
\r
73 @@ -230,16 +230,35 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
\r
74 notmuch_config_t *config;
\r
75 notmuch_database_t *notmuch;
\r
76 const char *db_path;
\r
77 + const char *folder = NULL;
\r
82 + notmuch_opt_desc_t options[] = {
\r
83 + { NOTMUCH_OPT_STRING, &folder, "folder", 0, 0 },
\r
84 + { NOTMUCH_OPT_END, 0, 0, 0, 0 }
\r
87 + opt_index = parse_arguments (argc, argv, options, 1);
\r
89 + if (opt_index < 0) {
\r
90 + fprintf (stderr, "Error: bad argument to notmuch insert: %s\n",
\r
91 + argv[-opt_index]);
\r
95 config = notmuch_config_open (ctx, NULL, NULL);
\r
99 db_path = notmuch_config_get_database_path (config);
\r
101 - maildir = talloc_asprintf (ctx, "%s", db_path);
\r
102 + if (folder != NULL) {
\r
103 + maildir = talloc_asprintf (ctx, "%s/%s", db_path, folder);
\r
105 + maildir = talloc_asprintf (ctx, "%s", db_path);
\r
108 fprintf (stderr, "Out of memory\n");
\r