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 797F2429E40
\r
6 for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:51:37 -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 CScjRkvH5tpW for <notmuch@notmuchmail.org>;
\r
17 Sat, 19 Jan 2013 16:51:36 -0800 (PST)
\r
18 Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com
\r
19 [209.85.160.50]) (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 A5255431FD7
\r
22 for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:51:22 -0800 (PST)
\r
23 Received: by mail-pb0-f50.google.com with SMTP id wz7so2678828pbc.37
\r
24 for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:51:21 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to
\r
27 :references; bh=8AfT3+ZwENkxpre4nk7PSAU4onr00rxvhHFAKCUbbQA=;
\r
28 b=juN0PNTOr/0ZsUFS9hAKN9f8NJ48F7YpVS8zeufXDRlYJuEAWidV3xX6+UUwuEqcTH
\r
29 YFFqKA0jUiSTidDRZidjSDPrHaLJqaiVGtOHkjxcWTwiEL6S8LtImMoxmmNmD6/nE1vM
\r
30 c+2G+SmsHnK9UZKXAM/03ylhUWaY1GYNEAdJ0md5Rs/5wTVJdVYfevvGpYbqZ9PRq3sO
\r
31 tIZnfBDCm0ESYcOgcBkogQ9Wbd9KR/a6ugYUdungz14vHhsctXgmDcv1I2/9rEjC5JeM
\r
32 pmufQ1ei7d8bQX88qXAtPorge0tY2tyq5JPthVhq9RxyAQ/Y8Duu1T7FytFwRBnWrrTB
\r
34 X-Received: by 10.66.79.168 with SMTP id k8mr36445007pax.22.1358643081774;
\r
35 Sat, 19 Jan 2013 16:51:21 -0800 (PST)
\r
36 Received: from localhost (215.42.233.220.static.exetel.com.au.
\r
38 by mx.google.com with ESMTPS id oi3sm5811448pbb.1.2013.01.19.16.51.19
\r
39 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
40 Sat, 19 Jan 2013 16:51:21 -0800 (PST)
\r
41 From: Peter Wang <novalazy@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v3 10/20] insert: support --folder option
\r
44 Date: Sun, 20 Jan 2013 11:49:54 +1100
\r
45 Message-Id: <1358643004-14522-11-git-send-email-novalazy@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.12.1
\r
47 In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com>
\r
48 References: <1358643004-14522-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, 20 Jan 2013 00:51:38 -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 | 22 ++++++++++++++++++++--
\r
67 1 file changed, 20 insertions(+), 2 deletions(-)
\r
69 diff --git a/notmuch-insert.c b/notmuch-insert.c
\r
70 index b0ac174..ba8cf5a 100644
\r
71 --- a/notmuch-insert.c
\r
72 +++ b/notmuch-insert.c
\r
73 @@ -236,11 +236,25 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
\r
74 size_t new_tags_length;
\r
75 tag_op_list_t *tag_ops;
\r
76 char *query_string = NULL;
\r
77 + const char *folder = NULL;
\r
79 - int opt_index = 1;
\r
84 + notmuch_opt_desc_t options[] = {
\r
85 + { NOTMUCH_OPT_STRING, &folder, "folder", 0, 0 },
\r
86 + { NOTMUCH_OPT_END, 0, 0, 0, 0 }
\r
89 + opt_index = parse_arguments (argc, argv, options, 1);
\r
91 + if (opt_index < 0) {
\r
92 + fprintf (stderr, "Error: bad argument to notmuch insert: %s\n",
\r
93 + argv[-opt_index]);
\r
97 config = notmuch_config_open (ctx, NULL, NULL);
\r
100 @@ -267,7 +281,11 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
\r
104 - maildir = talloc_asprintf (ctx, "%s", db_path);
\r
105 + if (folder != NULL) {
\r
106 + maildir = talloc_asprintf (ctx, "%s/%s", db_path, folder);
\r
108 + maildir = talloc_asprintf (ctx, "%s", db_path);
\r
111 fprintf (stderr, "Out of memory\n");
\r