#include "notmuch-client.h"
-typedef int (*command_function_t) (void *ctx, int argc, char *argv[]);
+typedef int (*command_function_t) (notmuch_config_t *config, int argc, char *argv[]);
typedef struct command {
const char *name;
command_function_t function;
+ notmuch_bool_t create_config;
const char *arguments;
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, notmuch_command, TRUE,
+ NULL,
+ "Notmuch main command." },
+ { "setup", notmuch_setup_command, TRUE,
NULL,
"Interactively setup notmuch for first use." },
- { "new", notmuch_new_command,
+ { "new", notmuch_new_command, FALSE,
"[options...]",
"Find and import new messages to the notmuch database." },
- { "search", notmuch_search_command,
+ { "search", notmuch_search_command, FALSE,
"[options...] <search-terms> [...]",
"Search for messages matching the given search terms." },
- { "show", notmuch_show_command,
+ { "show", notmuch_show_command, FALSE,
"<search-terms> [...]",
"Show all messages matching the search terms." },
- { "count", notmuch_count_command,
+ { "count", notmuch_count_command, FALSE,
"[options...] <search-terms> [...]",
"Count messages matching the search terms." },
- { "reply", notmuch_reply_command,
+ { "reply", notmuch_reply_command, FALSE,
"[options...] <search-terms> [...]",
"Construct a reply template for a set of messages." },
- { "tag", notmuch_tag_command,
+ { "tag", notmuch_tag_command, FALSE,
"+<tag>|-<tag> [...] [--] <search-terms> [...]" ,
"Add/remove tags for all messages matching the search terms." },
- { "dump", notmuch_dump_command,
+ { "dump", notmuch_dump_command, FALSE,
"[<filename>] [--] [<search-terms>]",
"Create a plain-text dump of the tags for each message." },
- { "restore", notmuch_restore_command,
+ { "restore", notmuch_restore_command, FALSE,
"[--accumulate] [<filename>]",
"Restore the tags from the given dump file (see 'dump')." },
- { "config", notmuch_config_command,
+ { "config", notmuch_config_command, FALSE,
"[get|set] <section>.<item> [value ...]",
"Get or set settings in the notmuch configuration file." },
- { "help", notmuch_help_command,
+ { "help", notmuch_help_command, TRUE, /* create but don't save config */
"[<command>]",
"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
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");
}
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" */
return 0;
}
- 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) {
* 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));
notmuch_config_get_user_name (config),
notmuch_config_get_user_primary_email (config));
- notmuch_config_close (config);
-
return 0;
}
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;
notmuch_bool_t print_help=FALSE, print_version=FALSE;
int opt_index;
+ int ret = 0;
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 }
};
/* 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 0;
}
- for (i = 0; i < ARRAY_SIZE (commands); i++) {
- command = &commands[i];
-
- if (strcmp (argv[opt_index], command->name) == 0) {
- int ret;
- char *talloc_report;
+ if (opt_index < argc)
+ command_name = argv[opt_index];
- ret = (command->function)(local, argc - opt_index, argv + opt_index);
-
- /* in the future support for this environment variable may
- * be supplemented or replaced by command line arguments
- * --leak-report and/or --leak-report-full */
+ command = find_command (command_name);
+ if (!command) {
+ fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
+ command_name);
+ return 1;
+ }
- talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");
+ config = notmuch_config_open (local, config_file_name, command->create_config);
+ if (!config)
+ return 1;
- /* 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");
- talloc_report_full (NULL, report);
- }
+ 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;
}
projects / notmuch / blobdiff