X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=b3fa9f3785459676152f2b9e04ddf50bb777e36f;hp=99ddd6d080fb6a23068ee904b2c6c0f23832da3b;hb=3fed6736a7ef8b8b1f05d0fabb136bdd3b5917ee;hpb=9c81214ae512b65f3146f1c432a8e14466d3dae5 diff --git a/notmuch.c b/notmuch.c index 99ddd6d0..b3fa9f37 100644 --- a/notmuch.c +++ b/notmuch.c @@ -22,6 +22,12 @@ #include "notmuch-client.h" +/* + * 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 { @@ -44,6 +50,8 @@ static command_t commands[] = { "Interactively setup notmuch for first use." }, { "new", notmuch_new_command, FALSE, "Find and import new messages to the notmuch database." }, + { "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, FALSE, @@ -58,6 +66,8 @@ static command_t commands[] = { "Create a plain-text dump of the tags for each message." }, { "restore", notmuch_restore_command, FALSE, "Restore the tags from the given dump file (see 'dump')." }, + { "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, TRUE, /* create but don't save config */ @@ -123,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. */ @@ -152,7 +162,7 @@ notmuch_help_command (notmuch_config_t *config, int argc, char *argv[]) if (argc == 0) { printf ("The notmuch mail system.\n\n"); usage (stdout); - return 0; + return EXIT_SUCCESS; } if (strcmp (argv[0], "help") == 0) { @@ -161,7 +171,7 @@ notmuch_help_command (notmuch_config_t *config, 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; } command = find_command (argv[0]); @@ -179,7 +189,7 @@ notmuch_help_command (notmuch_config_t *config, 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 @@ -207,7 +217,7 @@ notmuch_command (notmuch_config_t *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); @@ -215,7 +225,7 @@ notmuch_command (notmuch_config_t *config, "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" @@ -235,33 +245,7 @@ notmuch_command (notmuch_config_t *config, notmuch_config_get_user_name (config), notmuch_config_get_user_primary_email (config)); - return 0; -} - -static int -redirect_stderr (const char * stderr_file) -{ - if (strcmp (stderr_file, "-") == 0) { - if (dup2 (STDOUT_FILENO, STDERR_FILENO) < 0) { - perror ("dup2"); - return 1; - } - } else { - int fd = open (stderr_file, O_WRONLY|O_CREAT|O_TRUNC, 0666); - if (fd < 0) { - fprintf (stderr, "Error: Cannot redirect stderr to '%s': %s\n", - stderr_file, strerror (errno)); - return 1; - } - if (fd != STDERR_FILENO) { - if (dup2 (fd, STDERR_FILENO) < 0) { - perror ("dup2"); - return 1; - } - close (fd); - } - } - return 0; + return EXIT_SUCCESS; } int @@ -272,17 +256,15 @@ main (int argc, char *argv[]) const char *command_name = NULL; command_t *command; char *config_file_name = NULL; - char *stderr_file = NULL; - notmuch_config_t *config; + notmuch_config_t *config = NULL; notmuch_bool_t print_help=FALSE, print_version=FALSE; int opt_index; - int ret = 0; + 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 }, - { NOTMUCH_OPT_STRING, &stderr_file, "stderr", '\0', 0 }, { 0, 0, 0, 0, 0 } }; @@ -290,28 +272,29 @@ 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; opt_index = parse_arguments (argc, argv, options, 1); if (opt_index < 0) { - /* diagnostics already printed */ - return 1; + ret = EXIT_FAILURE; + goto DONE; } - if (stderr_file && redirect_stderr (stderr_file) != 0) { - /* error already printed */ - return 1; + if (print_help) { + ret = notmuch_help_command (NULL, argc - 1, &argv[1]); + goto DONE; } - if (print_help) - return notmuch_help_command (NULL, argc - 1, &argv[1]); if (print_version) { printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n"); - return 0; + ret = EXIT_SUCCESS; + goto DONE; } if (opt_index < argc) @@ -321,16 +304,21 @@ main (int argc, char *argv[]) if (!command) { fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n", command_name); - return 1; + ret = EXIT_FAILURE; + goto DONE; } config = notmuch_config_open (local, config_file_name, command->create_config); - if (!config) - return 1; + if (!config) { + ret = EXIT_FAILURE; + goto DONE; + } ret = (command->function)(config, argc - opt_index, argv + opt_index); - notmuch_config_close (config); + DONE: + if (config) + notmuch_config_close (config); talloc_report = getenv ("NOTMUCH_TALLOC_REPORT"); if (talloc_report && strcmp (talloc_report, "") != 0) {