const char *documentation;
} command_t;
-#define MAX_ALIAS_SUBSTITUTIONS 2
+#define MAX_ALIAS_SUBSTITUTIONS 3
typedef struct alias {
const char *name;
} alias_t;
alias_t aliases[] = {
- { "part", { "show", "--format=raw"}}
+ { "part", { "show", "--format=raw"}},
+ { "search-tags", {"search", "--output=tags", "*"}}
};
static int
notmuch_help_command (void *ctx, int argc, char *argv[]);
static const char search_terms_help[] =
- "\tSeveral notmuch commands accept a comman syntax for search\n"
+ "\tSeveral notmuch commands accept a common syntax for search\n"
"\tterms.\n"
"\n"
"\tThe search terms can consist of free-form text (and quoted\n"
"\n"
"\t--format=(text|json|mbox|raw)\n"
"\n"
- "\t\ttext (default)\n"
+ "\t\ttext (default for messages)\n"
"\n"
"\t\tThe default plain-text format has all text-content MIME parts\n"
"\t\tdecoded. Various components in the output, ('message', 'header',\n"
"\n"
"\t\thttp://homepage.ntlworld.com/jonathan.deboynepollard/FGA/mail-mbox-formats.html\n"
"\n"
- "\t\traw\n"
+ "\t\traw (default for a single part, see --part)\n"
"\n"
- "\t\tThe original, raw content of the email message is displayed.\n"
- "\t\tConsumers of this format should expect to implement MIME\n"
- "\t\tdecoding and similar functions. This format must only\n"
- "\t\tbe used with search terms matching a single message.\n"
+ "\t\tFor a message, the original, raw content of the email\n"
+ "\t\tmessage is output. Consumers of this format should\n"
+ "\t\texpect to implement MIME decoding and similar functions.\n"
+ "\n"
+ "\t\tFor a single part (--part) the raw part content is output\n"
+ "\t\tafter performing any necessary MIME decoding.\n"
+ "\n"
+ "\t\tThe raw format must only be used with search terms matching\n"
+ "\t\tsingle message.\n"
"\n"
"\t--part=N\n"
"\n"
"\t\tmessage MIME structure, and are identified in the 'json' or\n"
"\t\t'text' output formats.\n"
"\n"
+ "\t--verify\n"
+ "\n"
+ "\t\tCompute and report the validity of any MIME cryptographic\n"
+ "\t\tsignatures found in the selected content (ie.\n"
+ "\t\t\"multipart/signed\" parts). Status of the signature will be\n"
+ "\t\treported (currently only supported with --format=json) and\n"
+ "\t\tthe multipart/signed part will be replaced by the signed data.\n"
+ "\n"
+ "\t--decrypt\n"
+ "\n"
+ "\t\tDecrypt any MIME encrypted parts found in the selected content\n"
+ "\t\t(ie. \"multipart/encrypted\" parts). Status of the decryption\n"
+ "\t\twill be reported (currently only supported with --format=json)\n"
+ "\t\tand the multipart/encrypted part will be replaced by the\n"
+ "\t\tdecrypted content.\n"
+ "\n"
"\n"
"\tA common use of \"notmuch show\" is to display a single\n"
"\tthread of email messages. For this, use a search term of\n"
"\tSee \"notmuch help search-terms\" for details of the search\n"
"\tterms syntax." },
{ "dump", notmuch_dump_command,
- "[<filename>]",
+ "[<filename>] [--] [<search-terms>]",
"Create a plain-text dump of the tags for each message.",
"\tOutput is to the given filename, if any, or to stdout.\n"
+ "\tNote that using the filename argument is deprecated.\n"
+ "\n"
"\tThese tags are the only data in the notmuch database\n"
"\tthat can't be recreated from the messages themselves.\n"
"\tThe output of notmuch dump is therefore the only\n"
"\tcritical thing to backup (and much more friendly to\n"
- "\tincremental backup than the native database files.)" },
+ "\tincremental backup than the native database files.)\n"
+ "\n"
+ "\tWith no search terms, a dump of all messages in the\n"
+ "\tdatabase will be generated. A \"--\" argument instructs\n"
+ "\tnotmuch that the remaining arguments are search terms.\n"
+ "\n"
+ "\tSee \"notmuch help search-terms\" for the search-term syntax.\n"
+ },
{ "restore", notmuch_restore_command,
"<filename>",
"Restore the tags from the given dump file (see 'dump').",
"\tSo if you've previously been using sup for mail, then the\n"
"\t\"notmuch restore\" command provides you a way to import\n"
"\tall of your tags (or labels as sup calls them)." },
- { "search-tags", notmuch_search_tags_command,
- "[<search-terms> [...] ]",
- "List all tags found in the database or matching messages.",
- "\tRun this command without any search-term(s) to obtain a list\n"
- "\tof all tags found in the database. If you provide one or more\n"
- "\tsearch-terms as argument(s) then the resulting list will\n"
- "\tcontain tags only from messages that match the search-term(s).\n"
- "\n"
- "\tIn both cases the list will be alphabetically sorted." },
{ "config", notmuch_config_command,
"[get|set] <section>.<item> [value ...]",
"Get or set settings in the notmuch configuration file.",
command_t *command;
unsigned int i;
+ argc--; argv++; /* Ignore "help" */
+
if (argc == 0) {
printf ("The notmuch mail system.\n\n");
usage (stdout);
local = talloc_new (NULL);
g_mime_init (0);
+ g_type_init ();
if (argc == 1)
return notmuch (local);
command = &commands[i];
if (strcmp (argv[1], command->name) == 0)
- return (command->function) (local, argc - 2, &argv[2]);
+ return (command->function) (local, argc - 1, &argv[1]);
}
fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
projects / notmuch / blobdiff