X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=fa866d8645ee72ee00f7bc410a2a239e653f53f4;hp=c528dce2d12100b66d9dffd00093faefd33f5965;hb=de80ede3dfa88d50a3a4d34cedfcd71b8bde165b;hpb=447ad6b4984c71881b7f97641c77f0a39b71a991 diff --git a/notmuch.c b/notmuch.c index c528dce2..fa866d86 100644 --- a/notmuch.c +++ b/notmuch.c @@ -14,7 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/ . + * along with this program. If not, see https://www.gnu.org/licenses/ . * * Authors: Carl Worth * Keith Packard @@ -33,7 +33,7 @@ typedef int (*command_function_t) (notmuch_config_t *config, int argc, char *arg typedef struct command { const char *name; command_function_t function; - notmuch_bool_t create_config; + notmuch_config_mode_t config_mode; const char *summary; } command_t; @@ -46,12 +46,14 @@ notmuch_command (notmuch_config_t *config, int argc, char *argv[]); static int _help_for (const char *topic); -static notmuch_bool_t print_version = FALSE, print_help = FALSE; +static bool print_version = false, print_help = false; +const char *notmuch_requested_db_uuid = NULL; const notmuch_opt_desc_t notmuch_shared_options [] = { - { NOTMUCH_OPT_BOOLEAN, &print_version, "version", 'v', 0 }, - { NOTMUCH_OPT_BOOLEAN, &print_help, "help", 'h', 0 }, - {0, 0, 0, 0, 0} + { .opt_bool = &print_version, .name = "version" }, + { .opt_bool = &print_help, .name = "help" }, + { .opt_string = ¬much_requested_db_uuid, .name = "uuid" }, + { } }; /* any subcommand wanting to support these options should call @@ -80,8 +82,8 @@ int notmuch_minimal_options (const char *subcommand_name, int opt_index; notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 }, - { 0, 0, 0, 0, 0 } + { .opt_inherit = notmuch_shared_options }, + { } }; opt_index = parse_arguments (argc, argv, options, 1); @@ -94,36 +96,82 @@ int notmuch_minimal_options (const char *subcommand_name, return opt_index; } + +struct _notmuch_client_indexing_cli_choices indexing_cli_choices = { }; +const notmuch_opt_desc_t notmuch_shared_indexing_options [] = { + { .opt_bool = &indexing_cli_choices.try_decrypt, + .present = &indexing_cli_choices.try_decrypt_set, + .name = "try-decrypt" }, + { } +}; + + +notmuch_status_t +notmuch_process_shared_indexing_options (notmuch_database_t *notmuch, g_mime_3_unused(notmuch_config_t *config)) +{ + if (indexing_cli_choices.opts == NULL) + indexing_cli_choices.opts = notmuch_database_get_default_indexopts (notmuch); + if (indexing_cli_choices.try_decrypt_set) { + notmuch_status_t status; + if (indexing_cli_choices.opts == NULL) + return NOTMUCH_STATUS_OUT_OF_MEMORY; + status = notmuch_indexopts_set_try_decrypt (indexing_cli_choices.opts, indexing_cli_choices.try_decrypt); + if (status != NOTMUCH_STATUS_SUCCESS) { + fprintf (stderr, "Error: Failed to set try_decrypt to %s. (%s)\n", + indexing_cli_choices.try_decrypt ? "True" : "False", notmuch_status_to_string (status)); + notmuch_indexopts_destroy (indexing_cli_choices.opts); + indexing_cli_choices.opts = NULL; + return status; + } + } +#if (GMIME_MAJOR_VERSION < 3) + if (indexing_cli_choices.opts && notmuch_indexopts_get_try_decrypt (indexing_cli_choices.opts)) { + 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, TRUE, + { NULL, notmuch_command, NOTMUCH_CONFIG_OPEN | NOTMUCH_CONFIG_CREATE, "Notmuch main command." }, - { "setup", notmuch_setup_command, TRUE, + { "setup", notmuch_setup_command, NOTMUCH_CONFIG_OPEN | NOTMUCH_CONFIG_CREATE, "Interactively set up notmuch for first use." }, - { "new", notmuch_new_command, FALSE, + { "new", notmuch_new_command, NOTMUCH_CONFIG_OPEN, "Find and import new messages to the notmuch database." }, - { "insert", notmuch_insert_command, FALSE, + { "insert", notmuch_insert_command, NOTMUCH_CONFIG_OPEN, "Add a new message into the maildir and notmuch database." }, - { "search", notmuch_search_command, FALSE, + { "search", notmuch_search_command, NOTMUCH_CONFIG_OPEN, "Search for messages matching the given search terms." }, - { "address", notmuch_address_command, FALSE, + { "address", notmuch_address_command, NOTMUCH_CONFIG_OPEN, "Get addresses from messages matching the given search terms." }, - { "show", notmuch_show_command, FALSE, + { "show", notmuch_show_command, NOTMUCH_CONFIG_OPEN, "Show all messages matching the search terms." }, - { "count", notmuch_count_command, FALSE, + { "count", notmuch_count_command, NOTMUCH_CONFIG_OPEN, "Count messages matching the search terms." }, - { "reply", notmuch_reply_command, FALSE, + { "reply", notmuch_reply_command, NOTMUCH_CONFIG_OPEN, "Construct a reply template for a set of messages." }, - { "tag", notmuch_tag_command, FALSE, + { "tag", notmuch_tag_command, NOTMUCH_CONFIG_OPEN, "Add/remove tags for all messages matching the search terms." }, - { "dump", notmuch_dump_command, FALSE, + { "dump", notmuch_dump_command, NOTMUCH_CONFIG_OPEN, "Create a plain-text dump of the tags for each message." }, - { "restore", notmuch_restore_command, FALSE, + { "restore", notmuch_restore_command, NOTMUCH_CONFIG_OPEN, "Restore the tags from the given dump file (see 'dump')." }, - { "compact", notmuch_compact_command, FALSE, + { "compact", notmuch_compact_command, NOTMUCH_CONFIG_OPEN, "Compact the notmuch database." }, - { "config", notmuch_config_command, FALSE, + { "reindex", notmuch_reindex_command, NOTMUCH_CONFIG_OPEN, + "Re-index all messages matching the search terms." }, + { "config", notmuch_config_command, NOTMUCH_CONFIG_OPEN, "Get or set settings in the notmuch configuration file." }, - { "help", notmuch_help_command, TRUE, /* create but don't save config */ +#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 */ "This message, or more detailed help for the named command." } }; @@ -218,6 +266,22 @@ be supported in the future.\n", notmuch_format_version); } } +void +notmuch_exit_if_unmatched_db_uuid (notmuch_database_t *notmuch) +{ + const char *uuid = NULL; + + if (!notmuch_requested_db_uuid) + return; + IGNORE_RESULT (notmuch_database_get_revision (notmuch, &uuid)); + + 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); + } +} + static void exec_man (const char *page) { @@ -336,7 +400,7 @@ notmuch_command (notmuch_config_t *config, "You can also use \"notmuch show\" with any of the thread IDs resulting\n" "from a search. Finally, you may want to explore using a more sophisticated\n" "interface to notmuch such as the emacs interface implemented in notmuch.el\n" - "or any other interface described at http://notmuchmail.org\n\n" + "or any other interface described at https://notmuchmail.org\n\n" "And don't forget to run \"notmuch new\" whenever new mail arrives.\n\n" "Have fun, and may your inbox never have much mail.\n\n", notmuch_config_get_user_name (config), @@ -345,6 +409,39 @@ notmuch_command (notmuch_config_t *config, return EXIT_SUCCESS; } +/* + * Try to run subcommand in argv[0] as notmuch- prefixed external + * command. argv must be NULL terminated (argv passed to main always + * is). + * + * Does not return if the external command is found and + * executed. Return true if external command is not found. Return + * false on errors. + */ +static bool try_external_command(char *argv[]) +{ + char *old_argv0 = argv[0]; + bool ret = true; + + argv[0] = talloc_asprintf (NULL, "notmuch-%s", old_argv0); + + /* + * This will only return on errors. Not finding an external + * command (ENOENT) is not an error from our perspective. + */ + execvp (argv[0], argv); + if (errno != ENOENT) { + fprintf (stderr, "Error: Running external command '%s' failed: %s\n", + argv[0], strerror(errno)); + ret = false; + } + + talloc_free (argv[0]); + argv[0] = old_argv0; + + return ret; +} + int main (int argc, char *argv[]) { @@ -352,15 +449,15 @@ main (int argc, char *argv[]) char *talloc_report; const char *command_name = NULL; command_t *command; - char *config_file_name = NULL; + const char *config_file_name = NULL; notmuch_config_t *config = NULL; int opt_index; int ret; notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_STRING, &config_file_name, "config", 'c', 0 }, - { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 }, - { 0, 0, 0, 0, 0 } + { .opt_string = &config_file_name, .name = "config" }, + { .opt_inherit = notmuch_shared_options }, + { } }; talloc_enable_null_tracking (); @@ -381,20 +478,23 @@ main (int argc, char *argv[]) goto DONE; } - notmuch_process_shared_options (NULL); - if (opt_index < argc) command_name = argv[opt_index]; + notmuch_process_shared_options (command_name); + command = find_command (command_name); - if (!command) { - fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n", - command_name); + /* if command->function is NULL, try external command */ + if (!command || !command->function) { + /* This won't return if the external command is found. */ + 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->create_config); + config = notmuch_config_open (local, config_file_name, command->config_mode); if (!config) { ret = EXIT_FAILURE; goto DONE;