emacs: Allow customizing :excluded in notmuch-saved-searches

[notmuch] / notmuch.c

diff --git a/notmuch.c b/notmuch.c
index c47e64036786afbb19a834c49cc6aedffec7a5f2..814b9e42a59f46ae675f24f688005ec22ab58914 100644 (file)
--- 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
  * 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 <cworth@cworth.org>
  *         Keith Packard <keithp@keithp.com>
  *
  * Authors: Carl Worth <cworth@cworth.org>
  *         Keith Packard <keithp@keithp.com>


@@ -22,187 +22,356 @@
 
 #include "notmuch-client.h"
 
 
 #include "notmuch-client.h"
 

+/*
+ * Notmuch subcommand hook.
+ *
+ * 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_database_t *notmuch, int argc, char *argv[]);
+
+typedef struct command {
+    const char *name;
+    command_function_t function;
+    notmuch_command_mode_t mode;
+    const char *summary;
+} command_t;
+
+static int
+notmuch_help_command (notmuch_database_t *notmuch, int argc, char *argv[]);
+
+static int
+notmuch_command (notmuch_database_t *notmuch, int argc, char *argv[]);
+

 static int
 static int

-notmuch_help_command (void *ctx, int argc, char *argv[]);
-
-command_t commands[] = {
-    { "setup", notmuch_setup_command,
-      "Interactively setup notmuch for first use.",
-      "\t\tThe setup command is the first command you will run in order\n"
-      "\t\tto start using notmuch. It will prompt you for the directory\n"
-      "\t\tcontaining your email archives, and will then proceed to build\n"
-      "\t\ta database to allow fast searching of that mail.\n\n"
-      "\t\tInvoking notmuch with no command argument will run setup if\n"
-      "\t\tthe setup command has not previously been completed." },
+_help_for (const char *topic);
+
+static void
+notmuch_exit_if_unmatched_db_uuid (notmuch_database_t *notmuch);
+
+static bool print_version = false, print_help = false;
+static const char *notmuch_requested_db_uuid = NULL;
+static int query_syntax = NOTMUCH_QUERY_SYNTAX_XAPIAN;
+
+const notmuch_opt_desc_t notmuch_shared_options [] = {
+    { .opt_bool = &print_version, .name = "version" },
+    { .opt_bool = &print_help, .name = "help" },
+    { .opt_string = &notmuch_requested_db_uuid, .name = "uuid" },
+    { .opt_keyword = &query_syntax, .name = "query", .keywords =
+         (notmuch_keyword_t []){ { "infix", NOTMUCH_QUERY_SYNTAX_XAPIAN },
+                                 { "sexp", NOTMUCH_QUERY_SYNTAX_SEXP },
+                                 { 0, 0 } } },
+
+    { }
+};
+
+notmuch_query_syntax_t
+shared_option_query_syntax ()
+{
+    return query_syntax;
+}
+
+/* any subcommand wanting to support these options should call
+ * inherit notmuch_shared_options and call
+ * notmuch_process_shared_options (notmuch, subcommand_name);
+ * with notmuch = an open database, or NULL.
+ */
+void
+notmuch_process_shared_options (notmuch_database_t *notmuch, const char *subcommand_name)
+{
+    if (print_version) {
+       printf ("notmuch " STRINGIFY (NOTMUCH_VERSION) "\n");
+       exit (EXIT_SUCCESS);
+    }
+
+    if (print_help) {
+       int ret = _help_for (subcommand_name);
+       exit (ret);
+    }
+
+    if (notmuch) {
+       notmuch_exit_if_unmatched_db_uuid (notmuch);
+    } else {
+       if (notmuch_requested_db_uuid)
+           fprintf (stderr, "Warning: ignoring --uuid=%s\n",
+                    notmuch_requested_db_uuid);
+    }
+}
+
+/* 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 opt_index;
+
+    notmuch_opt_desc_t options[] = {
+       { .opt_inherit = notmuch_shared_options },
+       { }
+    };
+
+    opt_index = parse_arguments (argc, argv, options, 1);
+
+    if (opt_index < 0)
+       return -1;
+
+    /* We can't use argv here as it is sometimes NULL */
+    notmuch_process_shared_options (NULL, subcommand_name);
+    return opt_index;
+}
+
+
+struct _notmuch_client_indexing_cli_choices indexing_cli_choices = { };
+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 } },
+      .name = "decrypt" },
+    { }
+};
+
+
+notmuch_status_t
+notmuch_process_shared_indexing_options (notmuch_indexopts_t *opts)
+{
+    if (opts == NULL)
+       return NOTMUCH_STATUS_NULL_POINTER;
+
+    if (indexing_cli_choices.decrypt_policy_set) {
+       notmuch_status_t status;
+       status = notmuch_indexopts_set_decrypt_policy (opts,
+                                                      indexing_cli_choices.decrypt_policy);
+       if (status != NOTMUCH_STATUS_SUCCESS) {
+           fprintf (stderr, "Error: Failed to set index decryption policy to %d. (%s)\n",
+                    indexing_cli_choices.decrypt_policy, notmuch_status_to_string (status));
+           return status;
+       }
+    }
+    return NOTMUCH_STATUS_SUCCESS;
+}
+
+
+static const command_t commands[] = {
+    { NULL, notmuch_command, NOTMUCH_COMMAND_CONFIG_CREATE | NOTMUCH_COMMAND_CONFIG_LOAD,
+      "Notmuch main command." },
+    { "setup", notmuch_setup_command, NOTMUCH_COMMAND_CONFIG_CREATE | NOTMUCH_COMMAND_CONFIG_LOAD,
+      "Interactively set up notmuch for first use." },

     { "new", notmuch_new_command,
     { "new", notmuch_new_command,

-      "Find and import any new messages.",
-      "\t\tScans all sub-directories of the database, adding new messages\n"
-      "\t\tthat are found. Each new message will be tagged as both\n"
-      "\t\t\"inbox\" and \"unread\".\n"
-      "\n"
-      "\t\tNote: \"notmuch new\" will skip any read-only directories,\n"
-      "\t\tso you can use that to mark directories that will not\n"
-      "\t\treceive any new mail (and make \"notmuch new\" faster)." },
-    { "search", notmuch_search_command,
-      "<search-term> [...]\n\n"
-      "\t\tSearch for threads matching the given search terms.",
-      "\t\tNote that the individual mail messages will be matched\n"
-      "\t\tagainst the search terms, but the results will be the\n"
-      "\t\tthreads containing the matched messages.\n\n"
-      "\t\tCurrently, in addition to free text (and quoted phrases)\n"
-      "\t\twhich match terms appearing anywhere within an email,\n"
-      "\t\tthe following prefixes can be used to search specific\n"
-      "\t\tportions of an email, (where <brackets> indicate user-\n"
-      "\t\tsupplied values):\n\n"
-      "\t\t\tfrom:<name-or-address>\n"
-      "\t\t\tto:<name-or-address>\n"
-      "\t\t\tsubject:<word-or-quoted-phrase>\n"
-      "\t\t\ttag:<tag>\n"
-      "\t\t\tid:<message-id>\n"
-      "\t\t\tthread:<thread-id>\n\n"
-      "\t\tThe from: prefix is used to match the name or address of\n"
-      "\t\tthe sender of an email message.\n\n"
-      "\t\tThe to: prefix is used to match the names or addresses of\n"
-      "\t\tany recipient of an email message, (whether To, Cc, or Bcc).\n\n"
-      "\t\tAny term prefixed with subject: will match only text from\n"
-      "\t\tthe subject of an email. Quoted phrases are supported when\n"
-      "\t\tsearching with: subject:\"this is a phrase\".\n\n"
-      "\t\tValid tag values include \"inbox\" and \"unread\" by default\n"
-      "\t\tfor new messages added by \"notmuch new\" as well as any other\n"
-      "\t\ttag values added manually with \"notmuch tag\".\n\n"
-      "\t\tMessage ID values are the literal contents of the Message-ID:\n"
-      "\t\theader of email messages, but without the '<','>' delimiters.\n\n"
-      "\t\tThread ID values are generated internally by notmuch but can\n"
-      "\t\tbe seen in the output of \"notmuch search\" for example.\n\n"
-      "\t\tIn addition to individual terms, multiple terms can be\n"
-      "\t\tcombined with Boolean operators (\"and\", \"or\", \"not\", etc.).\n"
-      "\t\tEach term in the query will be implicitly connected by a\n"
-      "\t\tlogical AND if no explicit operator is provided, (except\n"
-      "\t\tthat terms with a common prefix will be implicitly combined\n"
-      "\t\twith OR until we get Xapian defect #402 fixed).\n\n"
-      "\t\tParentheses can also be used to control the combination of\n"
-      "\t\tthe Boolean operators, but will have to be protected from\n"
-      "\t\tinterpretation by the shell, (such as by putting quotation\n"
-      "\t\tmarks around any parenthesized expression)." },
-    { "reply", notmuch_reply_command,
-      "<search-terms> [...]\n\n"
-      "\t\tFormats a reply from a set of existing messages.",
-      "\t\tConstructs a new message as a reply to a set of existing\n"
-      "\t\tmessages. The From: address is used as a To: address\n"
-      "\t\talong with all old To: addresses. All of the Cc: addresses\n"
-      "\t\tare copied as new Cc: addresses. An In-Reply-To: header\n"
-      "\t\twill be constructed from the name and date of the original\n"
-      "\t\tmessage, and the original Message-ID will be added to the\n"
-      "\t\tlist of References in the new message. The text of each\n"
-      "\t\tmessage (as described in the \"show\" command) will be\n"
-      "\t\tpresented, each line prefixed with \"> \" The resulting\n"
-      "\t\tmessage will be dumped to stdout." },
-    { "show", notmuch_show_command,
-      "<search-terms> [...]\n\n"
-      "\t\tShows all messages matching the search terms.",
-      "\t\tSee the documentation of \"notmuch search\" for details\n"
-      "\t\tof the supported syntax of search terms.\n\n"
-      "\t\tA common use of \"notmuch show\" is to display a single\n"
-      "\t\tthread of email messages. For this, use a search term of\n"
-      "\t\t\"thread:<thread-id>\" as can be seen in the first column\n"
-      "\t\tof output from the \"notmuch search\" command.\n\n"
-      "\t\tAll messages will be displayed in date order. The output\n"
-      "\t\tformat is plain-text, with all text-content MIME parts\n"
-      "\t\tdecoded. Various components in the output, ('message',\n"
-      "\t\t'header', 'body', 'attachment', and MIME 'part') will be\n"
-      "\t\tdelimited by easily-parsed markers. Each marker consists\n"
-      "\t\tof a Control-L character (ASCII decimal 12), the name of\n"
-      "\t\tthe marker, and then either an opening or closing brace,\n"
-      "\t\t'{' or '}' to either open or close the component."},
-    { "tag", notmuch_tag_command,
-      "+<tag>|-<tag> [...] [--] <search-term> [...]\n\n"
-      "\t\tAdd/remove tags for all messages matching the search terms.",
-      "\t\tThe search terms are handled exactly as in 'search' so one\n"
-      "\t\tcan use that command first to see what will be modified.\n\n"
-      "\t\tTags prefixed by '+' are added while those prefixed by '-' are\n"
-      "\t\tremoved. For each message, tag removal is before tag addition.\n\n"
-      "\t\tThe beginning of <search-terms> is recognized by the first\n"
-      "\t\targument that begins with neither '+' nor '-'. Support for\n"
-      "\t\tan initial search term beginning with '+' or '-' is provided\n"
-      "\t\tby allowing the user to specify a \"--\" argument to separate\n"
-      "\t\tthe tags from the search terms.\n\n"
-      "\t\tNote: If you run \"notmuch new\" between reading a thread with\n"
-      "\t\t\"notmuch show\" and removing the \"inbox\" tag for that thread\n"
-      "\t\twith \"notmuch tag\" then you create the possibility of moving\n"
-      "\t\tsome messages from that thread out of your inbox without ever\n"
-      "\t\treading them. The easiest way to avoid this problem is to not\n"
-      "\t\trun \"notmuch new\" between reading and removing tags." },
-    { "dump", notmuch_dump_command,
-      "[<filename>]\n\n"
-      "\t\tCreate a plain-text dump of the tags for each message.",
-      "\t\tOutput is to the given filename, if any, or to stdout.\n"
-      "\t\tThese tags are the only data in the notmuch database\n"
-      "\t\tthat can't be recreated from the messages themselves.\n"
-      "\t\tThe output of notmuch dump is therefore the only\n"
-      "\t\tcritical thing to backup (and much more friendly to\n"
-      "\t\tincremental backup than the native database files.)" },
-    { "restore", notmuch_restore_command,
-      "<filename>\n\n"
-      "\t\tRestore the tags from the given dump file (see 'dump').",
-      "\t\tNote: The dump file format is specifically chosen to be\n"
-      "\t\tcompatible with the format of files produced by sup-dump.\n"
-      "\t\tSo if you've previously been using sup for mail, then the\n"
-      "\t\t\"notmuch restore\" command provides you a way to import\n"
-      "\t\tall of your tags (or labels as sup calls them)." },
-    { "help", notmuch_help_command,
-      "[<command>]\n\n"
-      "\t\tThis message, or more detailed help for the named command.",
-      "\t\tExcept in this case, where there's not much more detailed\n"
-      "\t\thelp available." }
+      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_COMMAND_DATABASE_EARLY |
+      NOTMUCH_COMMAND_DATABASE_WRITE,
+      "Add a new message into the maildir and notmuch database." },
+    { "search", notmuch_search_command, NOTMUCH_COMMAND_DATABASE_EARLY,
+      "Search for messages matching the given search terms." },
+    { "address", notmuch_address_command, NOTMUCH_COMMAND_DATABASE_EARLY,
+      "Get addresses from messages matching the given search terms." },
+    { "show", notmuch_show_command, NOTMUCH_COMMAND_DATABASE_EARLY,
+      "Show all messages matching the search terms." },
+    { "count", notmuch_count_command, NOTMUCH_COMMAND_DATABASE_EARLY,
+      "Count messages matching the search terms." },
+    { "reply", notmuch_reply_command, NOTMUCH_COMMAND_DATABASE_EARLY,
+      "Construct a reply template for a set of messages." },
+    { "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_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE,
+      "Create a plain-text dump of the tags for each message." },
+    { "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_COMMAND_DATABASE_EARLY |
+      NOTMUCH_COMMAND_DATABASE_WRITE,
+      "Compact the notmuch database." },
+    { "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_COMMAND_CONFIG_LOAD,
+      "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_COMMAND_CONFIG_CREATE, /* create but don't save config */
+      "This message, or more detailed help for the named command." }

 };
 
 };
 

+typedef struct help_topic {
+    const char *name;
+    const char *summary;
+} help_topic_t;
+
+static const help_topic_t help_topics[] = {
+    { "hooks",
+      "Hooks that will be run before or after certain commands." },
+    { "properties",
+      "Message property conventions and documentation." },
+    { "search-terms",
+      "Common infix search term syntax." },
+    { "sexp-queries",
+      "Common s-expression search term syntax." },
+};
+
+static const 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
 static void

-usage (void)
+usage (FILE *out)

 {
 {

-    command_t *command;
+    const command_t *command;
+    const help_topic_t *topic;

     unsigned int i;
 
     unsigned int i;
 

-    fprintf (stderr, "Usage: notmuch <command> [args...]\n");
-    fprintf (stderr, "\n");
-    fprintf (stderr, "Where <command> and [args...] are as follows:\n");
-    fprintf (stderr, "\n");
+    fprintf (out,
+            "Usage: notmuch --help\n"
+            "       notmuch --version\n"
+            "       notmuch <command> [args...]\n");
+    fprintf (out, "\n");
+    fprintf (out, "The available commands are as follows:\n");
+    fprintf (out, "\n");

 
     for (i = 0; i < ARRAY_SIZE (commands); i++) {
        command = &commands[i];
 
 
     for (i = 0; i < ARRAY_SIZE (commands); i++) {
        command = &commands[i];
 

-       fprintf (stderr, "\t%s\t%s\n\n", command->name, command->summary);
+       if (command->name)
+           fprintf (out, "  %-12s  %s\n", command->name, command->summary);
+    }
+
+    fprintf (out, "\n");
+    fprintf (out, "Additional help topics are as follows:\n");
+    fprintf (out, "\n");
+
+    for (i = 0; i < ARRAY_SIZE (help_topics); i++) {
+       topic = &help_topics[i];
+       fprintf (out, "  %-12s  %s\n", topic->name, topic->summary);
+    }
+
+    fprintf (out, "\n");
+    fprintf (out,
+            "Use \"notmuch help <command or topic>\" for more details "
+            "on each command or topic.\n\n");
+}
+
+void
+notmuch_exit_if_unsupported_format (void)
+{
+    if (notmuch_format_version > NOTMUCH_FORMAT_CUR) {
+       fprintf (stderr,
+                "\
+A caller requested output format version %d, but the installed notmuch\n\
+CLI only supports up to format version %d.  You may need to upgrade your\n\
+notmuch CLI.\n",
+                notmuch_format_version, NOTMUCH_FORMAT_CUR);
+       exit (NOTMUCH_EXIT_FORMAT_TOO_NEW);
+    } else if (notmuch_format_version < NOTMUCH_FORMAT_MIN) {
+       fprintf (stderr,
+                "\
+A caller requested output format version %d, which is no longer supported\n\
+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_MIN_ACTIVE) {
+       /* Warn about old version requests so compatibility issues are
+        * less likely when we drop support for a deprecated format
+        * versions. */
+       fprintf (stderr,
+                "\
+A caller requested deprecated output format version %d, which may not\n\
+be supported in the future.\n", notmuch_format_version);
+    }
+}
+
+static 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);

     }
     }

+}

 
 

-    fprintf (stderr, "Use \"notmuch help <command>\" for more details on each command.\n\n");
+static void
+exec_man (const char *page)
+{
+    if (execlp ("man", "man", page, (char *) NULL)) {
+       perror ("exec man");
+       exit (1);
+    }

 }
 
 static int
 }
 
 static int

-notmuch_help_command (unused (void *ctx), int argc, char *argv[])
+_help_for (const char *topic_name)

 {
 {

-    command_t *command;
-    unsigned int i;
+    char *page;

 
 

-    if (argc == 0) {
-       fprintf (stderr, "The notmuch mail system.\n\n");
-       usage ();
-       return 0;
+    if (! topic_name) {
+       printf ("The notmuch mail system.\n\n");
+       usage (stdout);
+       return EXIT_SUCCESS;

     }
 
     }
 

-    for (i = 0; i < ARRAY_SIZE (commands); i++) {
-       command = &commands[i];
+    if (strcmp (topic_name, "help") == 0) {
+       printf ("The notmuch help system.\n\n"
+               "\tNotmuch uses the man command to display help. In case\n"
+               "\tof difficulties check that MANPATH includes the pages\n"
+               "\tinstalled by notmuch.\n\n"
+               "\tTry \"notmuch help\" for a list of topics.\n");
+       return EXIT_SUCCESS;
+    }

 
 

-       if (strcmp (argv[0], command->name) == 0) {
-           fprintf (stderr, "Help for \"notmuch %s\":\n\n", argv[0]);
-           fprintf (stderr, "\t%s\t%s\n\n%s\n\n", command->name,
-                    command->summary, command->documentation);
-           return 0;
-       }
+    page = talloc_asprintf (NULL, "notmuch-%s", topic_name);
+    exec_man (page);
+
+    return EXIT_FAILURE;
+}
+
+static int
+notmuch_help_command (unused(notmuch_database_t *notmuch), int argc, char *argv[])
+{
+    int opt_index;
+
+    opt_index = notmuch_minimal_options ("help", argc, argv);
+    if (opt_index < 0)
+       return EXIT_FAILURE;
+
+    /* skip at least subcommand argument */
+    argc -= opt_index;
+    argv += opt_index;
+
+    if (argc == 0) {
+       return _help_for (NULL);

     }
 
     }
 

-    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 _help_for (argv[0]);

 }
 
 /* Handle the case of "notmuch" being invoked with no command
 }
 
 /* Handle the case of "notmuch" being invoked with no command


@@ -210,41 +379,24 @@ notmuch_help_command (unused (void *ctx), int argc, char *argv[])
  * to be more clever about this in the future.
  */
 static int
  * to be more clever about this in the future.
  */
 static int

-notmuch (void *ctx)
+notmuch_command (notmuch_database_t *notmuch,
+                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);
+    const char *config_path;

 
 

-    /* If the user has never configured notmuch, then run
+    /* If the user has not created a configuration file, then run

      * notmuch_setup_command which will give a nice welcome message,
      * and interactively guide the user through the configuration. */
      * 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);
-    }
-
-    /* Notmuch is already configured, but is there a database? */
-    db_path = talloc_asprintf (ctx, "%s/%s",
-                              notmuch_config_get_database_path (config),
-                              ".notmuch");
-    if (stat (db_path, &st)) {
-       notmuch_config_close (config);
+    config_path = notmuch_config_path (notmuch);
+    if (access (config_path, R_OK | F_OK) == -1) {

        if (errno != ENOENT) {
        if (errno != ENOENT) {

-           fprintf (stderr, "Error looking for notmuch database at %s: %s\n",
-                    db_path, strerror (errno));
-           return 1;
+           fprintf (stderr, "Error: %s config file access failed: %s\n", config_path,
+                    strerror (errno));
+           return EXIT_FAILURE;
+       } else {
+           return notmuch_setup_command (notmuch, 0, NULL);

        }
        }

-       printf ("Notmuch is configured, but there's not yet a database at\n\n\t%s\n\n",
-               db_path);
-       printf ("You probably want to run \"notmuch new\" now to create that database.\n\n"
-               "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;

     }
 
     printf ("Notmuch is configured and appears to have a database. Excellent!\n\n"
     }
 
     printf ("Notmuch is configured and appears to have a database. Excellent!\n\n"


@@ -258,44 +410,213 @@ notmuch (void *ctx)
            "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"
            "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",
            "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),
-           notmuch_config_get_user_primary_email (config));
+           notmuch_config_get (notmuch, NOTMUCH_CONFIG_USER_NAME),
+           notmuch_config_get (notmuch, NOTMUCH_CONFIG_PRIMARY_EMAIL));
+
+    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 (const char *config_file_name, char *argv[])
+{
+    char *old_argv0 = argv[0];
+    bool ret = true;

 
 

-    notmuch_config_close (config);
+    if (config_file_name) {
+       if (setenv ("NOTMUCH_CONFIG", config_file_name, 1)) {
+           perror ("setenv");
+           exit (1);
+       }
+    }
+
+    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;
+    }

 
 

-    return 0;
+    talloc_free (argv[0]);
+    argv[0] = old_argv0;
+
+    return ret;

 }
 
 int
 main (int argc, char *argv[])
 {
     void *local;
 }
 
 int
 main (int argc, char *argv[])
 {
     void *local;

-    command_t *command;
-    unsigned int i;
+    char *talloc_report;
+    const char *command_name = NULL;
+    const command_t *command;
+    const char *config_file_name = NULL;
+    notmuch_database_t *notmuch = NULL;
+    int opt_index;
+    int ret = EXIT_SUCCESS;
+
+    notmuch_opt_desc_t options[] = {
+       { .opt_string = &config_file_name, .name = "config", .allow_empty = TRUE },
+       { .opt_inherit = notmuch_shared_options },
+       { }
+    };
+
+    notmuch_client_init ();

 
     local = talloc_new (NULL);
 
 
     local = talloc_new (NULL);
 

-    g_mime_init (0);
+    /* 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) {
+       ret = EXIT_FAILURE;
+       goto DONE;
+    }

 
 

-    for (i = 0; i < ARRAY_SIZE (commands); i++) {
-       command = &commands[i];
+    if (opt_index < argc)
+       command_name = argv[opt_index];
+
+    notmuch_process_shared_options (NULL, command_name);

 
 

-       if (strcmp (argv[1], command->name) == 0)
-           return (command->function) (local, argc - 2, &argv[2]);
+    command = find_command (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 (config_file_name, argv + opt_index))
+           fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
+                    command_name);
+       ret = EXIT_FAILURE;
+       goto DONE;

     }
 
     }
 

-    /* Don't complain about "help" being an unknown command when we're
-       about to provide exactly what's wanted anyway. */
-    fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
-            argv[1]);
+    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,
+                                                         &notmuch,
+                                                         &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.\n", stderr);
+
+               return EXIT_FAILURE;
+           }
+       }
+
+       if (notmuch == NULL) {
+           status = notmuch_database_open_with_config (NULL,
+                                                       mode,
+                                                       config_file_name,
+                                                       NULL,
+                                                       &notmuch,
+                                                       &status_string);
+           if (status) {
+               if (status_string) {
+                   fputs (status_string, stderr);
+                   free (status_string);
+               }
+
+               return EXIT_FAILURE;
+           }
+       }
+    }
+
+    if (command->mode & NOTMUCH_COMMAND_CONFIG_LOAD) {
+       char *status_string = NULL;
+       notmuch_status_t status;
+       status = notmuch_database_load_config (NULL,
+                                              config_file_name,
+                                              NULL,
+                                              &notmuch,
+                                              &status_string);
+       if (status_string) {
+           fputs (status_string, stderr);
+           free (status_string);
+           status_string = NULL;
+       }
+
+       switch (status) {
+       case NOTMUCH_STATUS_NO_CONFIG:
+           if (! (command->mode & NOTMUCH_COMMAND_CONFIG_CREATE)) {
+               fputs ("Try running 'notmuch setup' to create a configuration.\n", stderr);
+               goto DONE;
+           }
+           break;
+       case NOTMUCH_STATUS_NO_DATABASE:
+           if (! command_name) {
+               printf ("Notmuch is configured, but no database was found.\n");
+               printf ("You probably want to run \"notmuch new\" now to create a database.\n\n"
+                       "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");
+               status = NOTMUCH_STATUS_SUCCESS;
+               goto DONE;
+           }
+           break;
+       case NOTMUCH_STATUS_SUCCESS:
+           break;
+       default:
+           fputs ("Error: unable to load config file.\n", stderr);
+           ret = 1;
+           goto DONE;
+       }
+
+    }
+
+    ret = (command->function)(notmuch, argc - opt_index, argv + opt_index);
+
+  DONE:
+    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, "a");
+       if (report) {
+           talloc_report_full (NULL, report);
+       } else {
+           ret = 1;
+           fprintf (stderr, "ERROR: unable to write talloc log. ");
+           perror (talloc_report);
+       }
+    }

 
     talloc_free (local);
 
 
     talloc_free (local);
 

-    return 1;
+    return ret;

 }
 }