X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-insert.c;h=00c0046873f50cc788717ebb86ef6a10314bf70a;hb=c1b99d6f949bbbd0eef1f70baa2a02c1857093b2;hp=cc5aeefc1fc00b907b09e22e4ac17d909d7b20c5;hpb=eef21c284742fa5ae14d7d352acc3a4dc98821ce;p=notmuch diff --git a/notmuch-insert.c b/notmuch-insert.c index cc5aeefc..00c00468 100644 --- a/notmuch-insert.c +++ b/notmuch-insert.c @@ -444,12 +444,11 @@ add_file (notmuch_database_t *notmuch, const char *path, tag_op_list_t *tag_ops, } int -notmuch_insert_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch, - int argc, char *argv[]) +notmuch_insert_command (notmuch_database_t *notmuch, int argc, char *argv[]) { notmuch_status_t status, close_status; struct sigaction action; - const char *db_path; + const char *mail_root; notmuch_config_values_t *new_tags = NULL; tag_op_list_t *tag_ops; char *query_string = NULL; @@ -481,13 +480,7 @@ notmuch_insert_command (unused(notmuch_config_t *config), notmuch_database_t *no notmuch_process_shared_options (argv[0]); - - db_path = notmuch_config_get (notmuch, NOTMUCH_CONFIG_DATABASE_PATH); - - if (! db_path) - INTERNAL_ERROR ("Unable to retrieve database path"); - else - db_path = talloc_strdup (local, db_path); + mail_root = notmuch_config_get (notmuch, NOTMUCH_CONFIG_MAIL_ROOT); new_tags = notmuch_config_get_values (notmuch, NOTMUCH_CONFIG_NEW_TAGS); @@ -533,7 +526,7 @@ notmuch_insert_command (unused(notmuch_config_t *config), notmuch_database_t *no return EXIT_FAILURE; } - maildir = talloc_asprintf (local, "%s/%s", db_path, folder); + maildir = talloc_asprintf (local, "%s/%s", mail_root, folder); if (! maildir) { fprintf (stderr, "Out of memory\n"); return EXIT_FAILURE;