size_t new_tags_length;
tag_op_list_t *tag_ops;
char *query_string = NULL;
- char *folder = NULL;
+ const char *folder = "";
notmuch_bool_t create_folder = FALSE;
notmuch_bool_t keep = FALSE;
notmuch_bool_t no_hooks = FALSE;
notmuch_bool_t synchronize_flags;
- const char *maildir;
+ char *maildir;
char *newpath;
int opt_index;
unsigned int i;
notmuch_opt_desc_t options[] = {
- { NOTMUCH_OPT_STRING, &folder, "folder", 0, 0 },
- { NOTMUCH_OPT_BOOLEAN, &create_folder, "create-folder", 0, 0 },
- { NOTMUCH_OPT_BOOLEAN, &keep, "keep", 0, 0 },
- { NOTMUCH_OPT_BOOLEAN, &no_hooks, "no-hooks", 'n', 0 },
- { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 },
- { NOTMUCH_OPT_END, 0, 0, 0, 0 }
+ { .opt_string = &folder, .name = "folder" },
+ { .opt_bool = &create_folder, .name = "create-folder" },
+ { .opt_bool = &keep, .name = "keep" },
+ { .opt_bool = &no_hooks, .name = "no-hooks" },
+ { .opt_inherit = notmuch_shared_options },
+ { }
};
opt_index = parse_arguments (argc, argv, options, 1);
return EXIT_FAILURE;
}
- if (folder == NULL) {
- maildir = db_path;
- } else {
- strip_trailing (folder, '/');
- if (! is_valid_folder_name (folder)) {
- fprintf (stderr, "Error: invalid folder name: '%s'\n", folder);
- return EXIT_FAILURE;
- }
- maildir = talloc_asprintf (config, "%s/%s", db_path, folder);
- if (! maildir) {
- fprintf (stderr, "Out of memory\n");
- return EXIT_FAILURE;
- }
- if (create_folder && ! maildir_create_folder (config, maildir))
- return EXIT_FAILURE;
+ if (! is_valid_folder_name (folder)) {
+ fprintf (stderr, "Error: invalid folder name: '%s'\n", folder);
+ return EXIT_FAILURE;
+ }
+
+ maildir = talloc_asprintf (config, "%s/%s", db_path, folder);
+ if (! maildir) {
+ fprintf (stderr, "Out of memory\n");
+ return EXIT_FAILURE;
}
+ strip_trailing (maildir, '/');
+ if (create_folder && ! maildir_create_folder (config, maildir))
+ return EXIT_FAILURE;
+
/* Set up our handler for SIGINT. We do not set SA_RESTART so that copying
* from standard input may be interrupted. */
memset (&action, 0, sizeof (struct sigaction));