X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=02148f2e3bf654253ee3f33778561a26329e3cc9;hp=b9c320329dd526000b436210d52cceee0ced0717;hb=ee5df7d7db895a427aa1e4343b2c8f794a0b2d73;hpb=71f1228a518f08e94dc1ea4e2147f80d3484c615 diff --git a/notmuch.c b/notmuch.c index b9c32032..02148f2e 100644 --- a/notmuch.c +++ b/notmuch.c @@ -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,14 +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; -char *notmuch_requested_db_uuid = NULL; +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 }, - { NOTMUCH_OPT_STRING, ¬much_requested_db_uuid, "uuid", 'u', 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 @@ -82,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); @@ -97,35 +97,37 @@ int notmuch_minimal_options (const char *subcommand_name, } 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 */ + { "help", notmuch_help_command, NOTMUCH_CONFIG_CREATE, /* create but don't save config */ "This message, or more detailed help for the named command." } }; @@ -369,13 +371,13 @@ notmuch_command (notmuch_config_t *config, * is). * * Does not return if the external command is found and - * executed. Return TRUE if external command is not found. Return - * FALSE on errors. + * executed. Return true if external command is not found. Return + * false on errors. */ -static notmuch_bool_t try_external_command(char *argv[]) +static bool try_external_command(char *argv[]) { char *old_argv0 = argv[0]; - notmuch_bool_t ret = TRUE; + bool ret = true; argv[0] = talloc_asprintf (NULL, "notmuch-%s", old_argv0); @@ -387,7 +389,7 @@ static notmuch_bool_t try_external_command(char *argv[]) if (errno != ENOENT) { fprintf (stderr, "Error: Running external command '%s' failed: %s\n", argv[0], strerror(errno)); - ret = FALSE; + ret = false; } talloc_free (argv[0]); @@ -403,15 +405,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 (); @@ -447,7 +449,7 @@ main (int argc, char *argv[]) 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;