From: Peter Wang <novalazy@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v3 10/20] insert: support --folder option
Date: Sun, 20 Jan 2013 11:49:54 +1100 [thread overview]
Message-ID: <1358643004-14522-11-git-send-email-novalazy@gmail.com> (raw)
In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com>
Allow the new message to be inserted into a folder within the Maildir
hierarchy instead of the top-level folder.
---
notmuch-insert.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/notmuch-insert.c b/notmuch-insert.c
index b0ac174..ba8cf5a 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -236,11 +236,25 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
size_t new_tags_length;
tag_op_list_t *tag_ops;
char *query_string = NULL;
+ const char *folder = NULL;
char *maildir;
- int opt_index = 1;
+ int opt_index;
unsigned int i;
notmuch_bool_t ret;
+ notmuch_opt_desc_t options[] = {
+ { NOTMUCH_OPT_STRING, &folder, "folder", 0, 0 },
+ { NOTMUCH_OPT_END, 0, 0, 0, 0 }
+ };
+
+ opt_index = parse_arguments (argc, argv, options, 1);
+
+ if (opt_index < 0) {
+ fprintf (stderr, "Error: bad argument to notmuch insert: %s\n",
+ argv[-opt_index]);
+ return 1;
+ }
+
config = notmuch_config_open (ctx, NULL, NULL);
if (config == NULL)
return 1;
@@ -267,7 +281,11 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
return 1;
}
- maildir = talloc_asprintf (ctx, "%s", db_path);
+ if (folder != NULL) {
+ maildir = talloc_asprintf (ctx, "%s/%s", db_path, folder);
+ } else {
+ maildir = talloc_asprintf (ctx, "%s", db_path);
+ }
if (! maildir) {
fprintf (stderr, "Out of memory\n");
return 1;
--
1.7.12.1
next prev parent reply other threads:[~2013-01-20 0:51 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-20 0:49 [PATCH v3 00/20] insert command Peter Wang
2013-01-20 0:49 ` [PATCH v3 01/20] cli: add stub for " Peter Wang
2013-01-22 21:45 ` Jani Nikula
2013-01-23 8:04 ` Peter Wang
2013-01-23 8:26 ` Tomi Ollila
2013-01-23 9:22 ` Jani Nikula
2013-01-20 0:49 ` [PATCH v3 02/20] insert: open Maildir tmp file Peter Wang
2013-01-20 0:49 ` [PATCH v3 03/20] insert: copy stdin to " Peter Wang
2013-01-20 0:49 ` [PATCH v3 04/20] insert: move file from Maildir tmp to new Peter Wang
2013-01-20 0:49 ` [PATCH v3 05/20] insert: add new message to database Peter Wang
2013-01-20 0:49 ` [PATCH v3 06/20] insert: apply default tags to new message Peter Wang
2013-01-20 0:49 ` [PATCH v3 07/20] tag-util: do not reset list in parse_tag_command_line Peter Wang
2013-01-21 18:09 ` Jani Nikula
2013-01-20 0:49 ` [PATCH v3 08/20] tag-util: move out 'tag' command-line checks Peter Wang
2013-01-21 18:05 ` Jani Nikula
2013-01-20 0:49 ` [PATCH v3 09/20] insert: parse and apply command-line tag operations Peter Wang
2013-01-20 0:49 ` Peter Wang [this message]
2013-01-20 0:49 ` [PATCH v3 11/20] insert: prevent writes outside Maildir hierarchy Peter Wang
2013-01-20 0:49 ` [PATCH v3 12/20] insert: add --create-folder option Peter Wang
2013-01-20 0:49 ` [PATCH v3 13/20] insert: fsync after writing tmp file Peter Wang
2013-01-20 0:49 ` [PATCH v3 14/20] insert: fsync new directory after rename Peter Wang
2013-01-20 0:49 ` [PATCH v3 15/20] insert: fsync parent directory after mkdir Peter Wang
2013-01-20 0:50 ` [PATCH v3 16/20] insert: trap SIGINT and clean up Peter Wang
2013-01-20 0:50 ` [PATCH v3 17/20] insert: add copyright line from notmuch-deliver Peter Wang
2013-01-20 0:50 ` [PATCH v3 18/20] man: document 'insert' command Peter Wang
2013-01-20 0:50 ` [PATCH v3 19/20] man: reference notmuch-insert.1 Peter Wang
2013-01-20 0:50 ` [PATCH v3 20/20] test: add tests for insert Peter Wang
2013-01-22 20:05 ` [PATCH v3 00/20] insert command Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358643004-14522-11-git-send-email-novalazy@gmail.com \
--to=novalazy@gmail.com \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).