X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=b3fa9f3785459676152f2b9e04ddf50bb777e36f;hp=cfb009ba5036eeff5235dc4b792d4bbeb2133f5f;hb=3fed6736a7ef8b8b1f05d0fabb136bdd3b5917ee;hpb=d037040997f0dc38467f51e2cd89a558a72acd2a diff --git a/notmuch.c b/notmuch.c index cfb009ba..b3fa9f37 100644 --- a/notmuch.c +++ b/notmuch.c @@ -22,54 +22,71 @@ #include "notmuch-client.h" -typedef int (*command_function_t) (void *ctx, int argc, char *argv[]); +/* + * Notmuch subcommand hook. + * + * The return value will be used as notmuch exit status code, + * preferrably EXIT_SUCCESS or EXIT_FAILURE. + */ +typedef int (*command_function_t) (notmuch_config_t *config, int argc, char *argv[]); typedef struct command { const char *name; command_function_t function; - const char *arguments; + notmuch_bool_t create_config; const char *summary; } command_t; static int -notmuch_help_command (void *ctx, int argc, char *argv[]); +notmuch_help_command (notmuch_config_t *config, int argc, char *argv[]); + +static int +notmuch_command (notmuch_config_t *config, int argc, char *argv[]); static command_t commands[] = { - { "setup", notmuch_setup_command, - NULL, + { NULL, notmuch_command, TRUE, + "Notmuch main command." }, + { "setup", notmuch_setup_command, TRUE, "Interactively setup notmuch for first use." }, - { "new", notmuch_new_command, - "[options...]", + { "new", notmuch_new_command, FALSE, "Find and import new messages to the notmuch database." }, - { "search", notmuch_search_command, - "[options...] [...]", + { "insert", notmuch_insert_command, FALSE, + "Add a new message into the maildir and notmuch database." }, + { "search", notmuch_search_command, FALSE, "Search for messages matching the given search terms." }, - { "show", notmuch_show_command, - " [...]", + { "show", notmuch_show_command, FALSE, "Show all messages matching the search terms." }, - { "count", notmuch_count_command, - "[options...] [...]", + { "count", notmuch_count_command, FALSE, "Count messages matching the search terms." }, - { "reply", notmuch_reply_command, - "[options...] [...]", + { "reply", notmuch_reply_command, FALSE, "Construct a reply template for a set of messages." }, - { "tag", notmuch_tag_command, - "+|- [...] [--] [...]" , + { "tag", notmuch_tag_command, FALSE, "Add/remove tags for all messages matching the search terms." }, - { "dump", notmuch_dump_command, - "[] [--] []", + { "dump", notmuch_dump_command, FALSE, "Create a plain-text dump of the tags for each message." }, - { "restore", notmuch_restore_command, - "[--accumulate] []", + { "restore", notmuch_restore_command, FALSE, "Restore the tags from the given dump file (see 'dump')." }, - { "config", notmuch_config_command, - "[get|set]
. [value ...]", + { "compact", notmuch_compact_command, FALSE, + "Compact the notmuch database." }, + { "config", notmuch_config_command, FALSE, "Get or set settings in the notmuch configuration file." }, - { "help", notmuch_help_command, - "[]", + { "help", notmuch_help_command, TRUE, /* create but don't save config */ "This message, or more detailed help for the named command." } }; +static command_t * +find_command (const char *name) +{ + size_t i; + + for (i = 0; i < ARRAY_SIZE (commands); i++) + if ((!name && !commands[i].name) || + (name && commands[i].name && strcmp (name, commands[i].name) == 0)) + return &commands[i]; + + return NULL; +} + int notmuch_format_version; static void @@ -89,8 +106,8 @@ usage (FILE *out) for (i = 0; i < ARRAY_SIZE (commands); i++) { command = &commands[i]; - fprintf (out, " %-11s %s\n", - command->name, command->summary); + if (command->name) + fprintf (out, " %-11s %s\n", command->name, command->summary); } fprintf (out, "\n"); @@ -116,7 +133,7 @@ by the notmuch CLI (it requires at least version %d). You may need to\n\ upgrade your notmuch front-end.\n", notmuch_format_version, NOTMUCH_FORMAT_MIN); exit (NOTMUCH_EXIT_FORMAT_TOO_OLD); - } else if (notmuch_format_version != NOTMUCH_FORMAT_CUR) { + } else if (notmuch_format_version < NOTMUCH_FORMAT_MIN_ACTIVE) { /* Warn about old version requests so compatibility issues are * less likely when we drop support for a deprecated format * versions. */ @@ -136,17 +153,16 @@ exec_man (const char *page) } static int -notmuch_help_command (void *ctx, int argc, char *argv[]) +notmuch_help_command (notmuch_config_t *config, int argc, char *argv[]) { command_t *command; - unsigned int i; argc--; argv++; /* Ignore "help" */ if (argc == 0) { printf ("The notmuch mail system.\n\n"); usage (stdout); - return 0; + return EXIT_SUCCESS; } if (strcmp (argv[0], "help") == 0) { @@ -155,16 +171,13 @@ notmuch_help_command (void *ctx, int argc, char *argv[]) "\tof difficulties check that MANPATH includes the pages\n" "\tinstalled by notmuch.\n\n" "\tTry \"notmuch help\" for a list of topics.\n"); - return 0; + return EXIT_SUCCESS; } - for (i = 0; i < ARRAY_SIZE (commands); i++) { - command = &commands[i]; - - if (strcmp (argv[0], command->name) == 0) { - char *page = talloc_asprintf (ctx, "notmuch-%s", command->name); - exec_man (page); - } + command = find_command (argv[0]); + if (command) { + char *page = talloc_asprintf (config, "notmuch-%s", command->name); + exec_man (page); } if (strcmp (argv[0], "search-terms") == 0) { @@ -176,7 +189,7 @@ notmuch_help_command (void *ctx, int argc, char *argv[]) fprintf (stderr, "\nSorry, %s is not a known command. There's not much I can do to help.\n\n", argv[0]); - return 1; + return EXIT_FAILURE; } /* Handle the case of "notmuch" being invoked with no command @@ -184,33 +197,27 @@ notmuch_help_command (void *ctx, int argc, char *argv[]) * to be more clever about this in the future. */ static int -notmuch (void *ctx) +notmuch_command (notmuch_config_t *config, + unused(int argc), unused(char *argv[])) { - notmuch_config_t *config; - notmuch_bool_t is_new; char *db_path; struct stat st; - config = notmuch_config_open (ctx, NULL, &is_new); - /* If the user has never configured notmuch, then run * notmuch_setup_command which will give a nice welcome message, * and interactively guide the user through the configuration. */ - if (is_new) { - notmuch_config_close (config); - return notmuch_setup_command (ctx, 0, NULL); - } + if (notmuch_config_is_new (config)) + return notmuch_setup_command (config, 0, NULL); /* Notmuch is already configured, but is there a database? */ - db_path = talloc_asprintf (ctx, "%s/%s", + db_path = talloc_asprintf (config, "%s/%s", notmuch_config_get_database_path (config), ".notmuch"); if (stat (db_path, &st)) { - notmuch_config_close (config); if (errno != ENOENT) { fprintf (stderr, "Error looking for notmuch database at %s: %s\n", db_path, strerror (errno)); - return 1; + return EXIT_FAILURE; } printf ("Notmuch is configured, but there's not yet a database at\n\n\t%s\n\n", db_path); @@ -218,7 +225,7 @@ notmuch (void *ctx) "Note that the first run of \"notmuch new\" can take a very long time\n" "and that the resulting database will use roughly the same amount of\n" "storage space as the email being indexed.\n\n"); - return 0; + return EXIT_SUCCESS; } printf ("Notmuch is configured and appears to have a database. Excellent!\n\n" @@ -238,23 +245,26 @@ notmuch (void *ctx) notmuch_config_get_user_name (config), notmuch_config_get_user_primary_email (config)); - notmuch_config_close (config); - - return 0; + return EXIT_SUCCESS; } int main (int argc, char *argv[]) { void *local; + char *talloc_report; + const char *command_name = NULL; command_t *command; - unsigned int i; + char *config_file_name = NULL; + notmuch_config_t *config = NULL; notmuch_bool_t print_help=FALSE, print_version=FALSE; int opt_index; + int ret; notmuch_opt_desc_t options[] = { { NOTMUCH_OPT_BOOLEAN, &print_help, "help", 'h', 0 }, { NOTMUCH_OPT_BOOLEAN, &print_version, "version", 'v', 0 }, + { NOTMUCH_OPT_STRING, &config_file_name, "config", 'c', 0 }, { 0, 0, 0, 0, 0 } }; @@ -262,62 +272,71 @@ main (int argc, char *argv[]) local = talloc_new (NULL); - g_mime_init (0); + g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS); +#if !GLIB_CHECK_VERSION(2, 35, 1) g_type_init (); +#endif /* Globally default to the current output format version. */ notmuch_format_version = NOTMUCH_FORMAT_CUR; - if (argc == 1) - return notmuch (local); - opt_index = parse_arguments (argc, argv, options, 1); if (opt_index < 0) { - /* diagnostics already printed */ - return 1; + ret = EXIT_FAILURE; + goto DONE; } - if (print_help) - return notmuch_help_command (NULL, argc - 1, &argv[1]); + if (print_help) { + ret = notmuch_help_command (NULL, argc - 1, &argv[1]); + goto DONE; + } if (print_version) { printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n"); - return 0; + ret = EXIT_SUCCESS; + goto DONE; } - for (i = 0; i < ARRAY_SIZE (commands); i++) { - command = &commands[i]; + if (opt_index < argc) + command_name = argv[opt_index]; - if (strcmp (argv[opt_index], command->name) == 0) { - int ret; - char *talloc_report; - - ret = (command->function)(local, argc - opt_index, argv + opt_index); + command = find_command (command_name); + if (!command) { + fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n", + command_name); + ret = EXIT_FAILURE; + goto DONE; + } - talloc_report = getenv ("NOTMUCH_TALLOC_REPORT"); + config = notmuch_config_open (local, config_file_name, command->create_config); + if (!config) { + ret = EXIT_FAILURE; + goto DONE; + } - /* this relies on the previous call to - * talloc_enable_null_tracking */ + ret = (command->function)(config, argc - opt_index, argv + opt_index); - if (talloc_report && strcmp (talloc_report, "") != 0) { - FILE *report = fopen (talloc_report, "w"); - if (report) { - talloc_report_full (NULL, report); - } else { - ret = 1; - fprintf (stderr, "ERROR: unable to write talloc log. "); - perror (talloc_report); - } - } + DONE: + if (config) + notmuch_config_close (config); - return ret; + talloc_report = getenv ("NOTMUCH_TALLOC_REPORT"); + if (talloc_report && strcmp (talloc_report, "") != 0) { + /* this relies on the previous call to + * talloc_enable_null_tracking + */ + + FILE *report = fopen (talloc_report, "w"); + if (report) { + talloc_report_full (NULL, report); + } else { + ret = 1; + fprintf (stderr, "ERROR: unable to write talloc log. "); + perror (talloc_report); } } - fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n", - argv[1]); - talloc_free (local); - return 1; + return ret; }