X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=7360e0e6d5872fe61e691e5da44e62de0e28d5f3;hp=7810b68569f5eb47be8d54bca78aa5206e6cd741;hb=4c79a2dabe38ac72eb9eb21620f2ffca5f1885c6;hpb=963ccabe93b0564e6979433f5be34395e9aa8ef1 diff --git a/notmuch.c b/notmuch.c index 7810b685..7360e0e6 100644 --- a/notmuch.c +++ b/notmuch.c @@ -27,21 +27,24 @@ * * The return value will be used as notmuch exit status code, * preferably EXIT_SUCCESS or EXIT_FAILURE. + * + * Each subcommand should be passed either a config object, or an open + * database */ -typedef int (*command_function_t) (notmuch_config_t *config, int argc, char *argv[]); +typedef int (*command_function_t) (notmuch_config_t *config, notmuch_database_t *notmuch, int argc, char *argv[]); typedef struct command { const char *name; command_function_t function; - notmuch_config_mode_t config_mode; + notmuch_command_mode_t mode; const char *summary; } command_t; static int -notmuch_help_command (notmuch_config_t *config, int argc, char *argv[]); +notmuch_help_command (notmuch_config_t *config, notmuch_database_t *notmuch, int argc, char *argv[]); static int -notmuch_command (notmuch_config_t *config, int argc, char *argv[]); +notmuch_command (notmuch_config_t *config, notmuch_database_t *notmuch, int argc, char *argv[]); static int _help_for (const char *topic); @@ -61,9 +64,10 @@ const notmuch_opt_desc_t notmuch_shared_options [] = { * notmuch_process_shared_options (subcommand_name); */ void -notmuch_process_shared_options (const char *subcommand_name) { +notmuch_process_shared_options (const char *subcommand_name) +{ if (print_version) { - printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n"); + printf ("notmuch " STRINGIFY (NOTMUCH_VERSION) "\n"); exit (EXIT_SUCCESS); } @@ -76,8 +80,9 @@ notmuch_process_shared_options (const char *subcommand_name) { /* This is suitable for subcommands that do not actually open the * database. */ -int notmuch_minimal_options (const char *subcommand_name, - int argc, char **argv) +int +notmuch_minimal_options (const char *subcommand_name, + int argc, char **argv) { int opt_index; @@ -98,21 +103,21 @@ int notmuch_minimal_options (const char *subcommand_name, struct _notmuch_client_indexing_cli_choices indexing_cli_choices = { }; -const notmuch_opt_desc_t notmuch_shared_indexing_options [] = { +const notmuch_opt_desc_t notmuch_shared_indexing_options [] = { { .opt_keyword = &indexing_cli_choices.decrypt_policy, .present = &indexing_cli_choices.decrypt_policy_set, .keywords = - (notmuch_keyword_t []){ { "false", NOTMUCH_DECRYPT_FALSE }, - { "true", NOTMUCH_DECRYPT_TRUE }, - { "auto", NOTMUCH_DECRYPT_AUTO }, - { "nostash", NOTMUCH_DECRYPT_NOSTASH }, - { 0, 0 } }, + (notmuch_keyword_t []){ { "false", NOTMUCH_DECRYPT_FALSE }, + { "true", NOTMUCH_DECRYPT_TRUE }, + { "auto", NOTMUCH_DECRYPT_AUTO }, + { "nostash", NOTMUCH_DECRYPT_NOSTASH }, + { 0, 0 } }, .name = "decrypt" }, { } }; notmuch_status_t -notmuch_process_shared_indexing_options (notmuch_database_t *notmuch, g_mime_3_unused(notmuch_config_t *config)) +notmuch_process_shared_indexing_options (notmuch_database_t *notmuch) { if (indexing_cli_choices.opts == NULL) indexing_cli_choices.opts = notmuch_database_get_default_indexopts (notmuch); @@ -129,54 +134,47 @@ notmuch_process_shared_indexing_options (notmuch_database_t *notmuch, g_mime_3_u return status; } } -#if (GMIME_MAJOR_VERSION < 3) - if (indexing_cli_choices.opts && notmuch_indexopts_get_decrypt_policy (indexing_cli_choices.opts) != NOTMUCH_DECRYPT_FALSE) { - const char* gpg_path = notmuch_config_get_crypto_gpg_path (config); - if (gpg_path && strcmp(gpg_path, "gpg")) - fprintf (stderr, "Warning: deprecated crypto.gpg_path is set to '%s'\n" - "\tbut ignoring (use $PATH instead)\n", gpg_path); - } -#endif return NOTMUCH_STATUS_SUCCESS; } static command_t commands[] = { - { NULL, notmuch_command, NOTMUCH_CONFIG_OPEN | NOTMUCH_CONFIG_CREATE, + { NULL, notmuch_command, NOTMUCH_COMMAND_CONFIG_OPEN | NOTMUCH_COMMAND_CONFIG_CREATE, "Notmuch main command." }, - { "setup", notmuch_setup_command, NOTMUCH_CONFIG_OPEN | NOTMUCH_CONFIG_CREATE, + { "setup", notmuch_setup_command, NOTMUCH_COMMAND_CONFIG_OPEN | NOTMUCH_COMMAND_CONFIG_CREATE, "Interactively set up notmuch for first use." }, - { "new", notmuch_new_command, NOTMUCH_CONFIG_OPEN, + { "new", notmuch_new_command, + NOTMUCH_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE | NOTMUCH_COMMAND_DATABASE_CREATE, "Find and import new messages to the notmuch database." }, - { "insert", notmuch_insert_command, NOTMUCH_CONFIG_OPEN, + { "insert", notmuch_insert_command, NOTMUCH_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE, "Add a new message into the maildir and notmuch database." }, - { "search", notmuch_search_command, NOTMUCH_CONFIG_OPEN, + { "search", notmuch_search_command, NOTMUCH_COMMAND_DATABASE_EARLY, "Search for messages matching the given search terms." }, - { "address", notmuch_address_command, NOTMUCH_CONFIG_OPEN, + { "address", notmuch_address_command, NOTMUCH_COMMAND_DATABASE_EARLY, "Get addresses from messages matching the given search terms." }, - { "show", notmuch_show_command, NOTMUCH_CONFIG_OPEN, + { "show", notmuch_show_command, NOTMUCH_COMMAND_CONFIG_OPEN, "Show all messages matching the search terms." }, - { "count", notmuch_count_command, NOTMUCH_CONFIG_OPEN, + { "count", notmuch_count_command, NOTMUCH_COMMAND_DATABASE_EARLY, "Count messages matching the search terms." }, - { "reply", notmuch_reply_command, NOTMUCH_CONFIG_OPEN, + { "reply", notmuch_reply_command, NOTMUCH_COMMAND_DATABASE_EARLY, "Construct a reply template for a set of messages." }, - { "tag", notmuch_tag_command, NOTMUCH_CONFIG_OPEN, + { "tag", notmuch_tag_command, NOTMUCH_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE, "Add/remove tags for all messages matching the search terms." }, - { "dump", notmuch_dump_command, NOTMUCH_CONFIG_OPEN, + { "dump", notmuch_dump_command, NOTMUCH_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE, "Create a plain-text dump of the tags for each message." }, - { "restore", notmuch_restore_command, NOTMUCH_CONFIG_OPEN, + { "restore", notmuch_restore_command, NOTMUCH_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE, "Restore the tags from the given dump file (see 'dump')." }, - { "compact", notmuch_compact_command, NOTMUCH_CONFIG_OPEN, + { "compact", notmuch_compact_command, NOTMUCH_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE, "Compact the notmuch database." }, - { "reindex", notmuch_reindex_command, NOTMUCH_CONFIG_OPEN, + { "reindex", notmuch_reindex_command, NOTMUCH_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE, "Re-index all messages matching the search terms." }, - { "config", notmuch_config_command, NOTMUCH_CONFIG_OPEN, + { "config", notmuch_config_command, NOTMUCH_COMMAND_CONFIG_OPEN, "Get or set settings in the notmuch configuration file." }, #if WITH_EMACS { "emacs-mua", NULL, 0, "send mail with notmuch and emacs." }, #endif - { "help", notmuch_help_command, NOTMUCH_CONFIG_CREATE, /* create but don't save config */ + { "help", notmuch_help_command, NOTMUCH_COMMAND_CONFIG_CREATE, /* create but don't save config */ "This message, or more detailed help for the named command." } }; @@ -200,7 +198,7 @@ find_command (const char *name) size_t i; for (i = 0; i < ARRAY_SIZE (commands); i++) - if ((!name && !commands[i].name) || + if ((! name && ! commands[i].name) || (name && commands[i].name && strcmp (name, commands[i].name) == 0)) return &commands[i]; @@ -278,11 +276,11 @@ notmuch_exit_if_unmatched_db_uuid (notmuch_database_t *notmuch) { const char *uuid = NULL; - if (!notmuch_requested_db_uuid) + if (! notmuch_requested_db_uuid) return; IGNORE_RESULT (notmuch_database_get_revision (notmuch, &uuid)); - if (strcmp (notmuch_requested_db_uuid, uuid) != 0){ + if (strcmp (notmuch_requested_db_uuid, uuid) != 0) { fprintf (stderr, "Error: requested database revision %s does not match %s\n", notmuch_requested_db_uuid, uuid); exit (1); @@ -305,7 +303,7 @@ _help_for (const char *topic_name) help_topic_t *topic; unsigned int i; - if (!topic_name) { + if (! topic_name) { printf ("The notmuch mail system.\n\n"); usage (stdout); return EXIT_SUCCESS; @@ -341,7 +339,7 @@ _help_for (const char *topic_name) } static int -notmuch_help_command (unused (notmuch_config_t * config), int argc, char *argv[]) +notmuch_help_command (unused (notmuch_config_t *config), unused(notmuch_database_t *notmuch), int argc, char *argv[]) { int opt_index; @@ -350,8 +348,8 @@ notmuch_help_command (unused (notmuch_config_t * config), int argc, char *argv[] return EXIT_FAILURE; /* skip at least subcommand argument */ - argc-= opt_index; - argv+= opt_index; + argc -= opt_index; + argv += opt_index; if (argc == 0) { return _help_for (NULL); @@ -366,7 +364,8 @@ notmuch_help_command (unused (notmuch_config_t * config), int argc, char *argv[] */ static int notmuch_command (notmuch_config_t *config, - unused(int argc), unused(char *argv[])) + unused(notmuch_database_t *notmuch), + unused(int argc), unused(char **argv)) { char *db_path; struct stat st; @@ -375,7 +374,7 @@ notmuch_command (notmuch_config_t *config, * notmuch_setup_command which will give a nice welcome message, * and interactively guide the user through the configuration. */ if (notmuch_config_is_new (config)) - return notmuch_setup_command (config, 0, NULL); + return notmuch_setup_command (config, NULL, 0, NULL); /* Notmuch is already configured, but is there a database? */ db_path = talloc_asprintf (config, "%s/%s", @@ -425,7 +424,8 @@ notmuch_command (notmuch_config_t *config, * executed. Return true if external command is not found. Return * false on errors. */ -static bool try_external_command(char *argv[]) +static bool +try_external_command (char *argv[]) { char *old_argv0 = argv[0]; bool ret = true; @@ -439,7 +439,7 @@ static bool try_external_command(char *argv[]) execvp (argv[0], argv); if (errno != ENOENT) { fprintf (stderr, "Error: Running external command '%s' failed: %s\n", - argv[0], strerror(errno)); + argv[0], strerror (errno)); ret = false; } @@ -458,6 +458,7 @@ main (int argc, char *argv[]) command_t *command; const char *config_file_name = NULL; notmuch_config_t *config = NULL; + notmuch_database_t *notmuch = NULL; int opt_index; int ret; @@ -471,8 +472,8 @@ main (int argc, char *argv[]) local = talloc_new (NULL); - g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS); -#if !GLIB_CHECK_VERSION(2, 35, 1) + g_mime_init (); +#if ! GLIB_CHECK_VERSION (2, 35, 1) g_type_init (); #endif @@ -492,22 +493,69 @@ main (int argc, char *argv[]) command = find_command (command_name); /* if command->function is NULL, try external command */ - if (!command || !command->function) { + if (! command || ! command->function) { /* This won't return if the external command is found. */ - if (try_external_command(argv + opt_index)) + if (try_external_command (argv + opt_index)) fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n", command_name); ret = EXIT_FAILURE; goto DONE; } - config = notmuch_config_open (local, config_file_name, command->config_mode); - if (!config) { - ret = EXIT_FAILURE; - goto DONE; - } + if (command->mode & NOTMUCH_COMMAND_DATABASE_EARLY) { + char *status_string = NULL; + notmuch_database_mode_t mode; + notmuch_status_t status; + + if (command->mode & NOTMUCH_COMMAND_DATABASE_WRITE || + command->mode & NOTMUCH_COMMAND_DATABASE_CREATE) + mode = NOTMUCH_DATABASE_MODE_READ_WRITE; + else + mode = NOTMUCH_DATABASE_MODE_READ_ONLY; + + if (command->mode & NOTMUCH_COMMAND_DATABASE_CREATE) { + status = notmuch_database_create_with_config (NULL, + config_file_name, + NULL, + ¬much, + &status_string); + if (status && status != NOTMUCH_STATUS_DATABASE_EXISTS) { + if (status_string) { + fputs (status_string, stderr); + free (status_string); + } + + if (status == NOTMUCH_STATUS_NO_CONFIG) + fputs ("Try running 'notmuch setup' to create a configuration.", stderr); + + return EXIT_FAILURE; + } + } - ret = (command->function)(config, argc - opt_index, argv + opt_index); + if (notmuch == NULL) { + status = notmuch_database_open_with_config (NULL, + mode, + config_file_name, + NULL, + ¬much, + &status_string); + if (status) { + if (status_string) { + fputs (status_string, stderr); + free (status_string); + } + + return EXIT_FAILURE; + } + } + } else { + config = notmuch_config_open (local, config_file_name, command->mode); + if (! config) { + ret = EXIT_FAILURE; + goto DONE; + } + } + ret = (command->function)(config, notmuch, argc - opt_index, argv + opt_index); DONE: if (config)