#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;
- 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 (void *ctx, int argc, char *argv[]);
+notmuch_command (notmuch_config_t *config, int argc, char *argv[]);
static command_t commands[] = {
- { NULL, notmuch_command,
- NULL,
+ { NULL, notmuch_command, TRUE,
"Notmuch main command." },
- { "setup", notmuch_setup_command,
- NULL,
+ { "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...] <search-terms> [...]",
+ { "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,
- "<search-terms> [...]",
+ { "show", notmuch_show_command, FALSE,
"Show all messages matching the search terms." },
- { "count", notmuch_count_command,
- "[options...] <search-terms> [...]",
+ { "count", notmuch_count_command, FALSE,
"Count messages matching the search terms." },
- { "reply", notmuch_reply_command,
- "[options...] <search-terms> [...]",
+ { "reply", notmuch_reply_command, FALSE,
"Construct a reply template for a set of messages." },
- { "tag", notmuch_tag_command,
- "+<tag>|-<tag> [...] [--] <search-terms> [...]" ,
+ { "tag", notmuch_tag_command, FALSE,
"Add/remove tags for all messages matching the search terms." },
- { "dump", notmuch_dump_command,
- "[<filename>] [--] [<search-terms>]",
+ { "dump", notmuch_dump_command, FALSE,
"Create a plain-text dump of the tags for each message." },
- { "restore", notmuch_restore_command,
- "[--accumulate] [<filename>]",
+ { "restore", notmuch_restore_command, FALSE,
"Restore the tags from the given dump file (see 'dump')." },
- { "config", notmuch_config_command,
- "[get|set] <section>.<item> [value ...]",
+ { "config", notmuch_config_command, FALSE,
"Get or set settings in the notmuch configuration file." },
- { "help", notmuch_help_command,
- "[<command>]",
+ { "help", notmuch_help_command, TRUE, /* create but don't save config */
"This message, or more detailed help for the named command." }
};
}
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;
command = find_command (argv[0]);
if (command) {
- char *page = talloc_asprintf (ctx, "notmuch-%s", command->name);
+ char *page = talloc_asprintf (config, "notmuch-%s", command->name);
exec_man (page);
}
* to be more clever about this in the future.
*/
static int
-notmuch_command (void *ctx, unused(int argc), unused(char *argv[]))
+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;
}
char *talloc_report;
const char *command_name = NULL;
command_t *command;
+ 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 }
};
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;
return 1;
}
- ret = (command->function)(local, argc - opt_index, argv + opt_index);
+ config = notmuch_config_open (local, config_file_name, command->create_config);
+ if (!config)
+ return 1;
+
+ ret = (command->function)(config, argc - opt_index, argv + opt_index);
+
+ notmuch_config_close (config);
talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");
if (talloc_report && strcmp (talloc_report, "") != 0) {
projects / notmuch / blobdiff