X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=477a09cf05dd1bd803e8d68bfadf0e3c82660a65;hp=87479f81056b53cef82859c61adb7794f19ecf79;hb=c158201ee217740cb1b64858df8c7d39cf7793d0;hpb=0ea5f3fc0e0336921ba670a28201b59d2c977cfb diff --git a/notmuch.c b/notmuch.c index 87479f81..477a09cf 100644 --- a/notmuch.c +++ b/notmuch.c @@ -29,261 +29,57 @@ typedef struct command { command_function_t function; const char *arguments; const char *summary; - const char *documentation; } command_t; +#define MAX_ALIAS_SUBSTITUTIONS 3 + +typedef struct alias { + const char *name; + const char *substitutions[MAX_ALIAS_SUBSTITUTIONS]; +} alias_t; + +alias_t aliases[] = { + { "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[] = - "\t\tSeveral notmuch commands accept a comman syntax for search\n" - "\t\tterms.\n" - "\n" - "\t\tThe search terms can consist of free-form text (and quoted\n" - "\t\tphrases) which will match all messages that contain all of\n" - "\t\tthe given terms/phrases in the body, the subject, or any of\n" - "\t\tthe sender or recipient headers.\n" - "\n" - "\t\tIn addition to free text, the following prefixes can be used\n" - "\t\tto force terms to match against specific portions of an email,\n" - "\t\t(where indicate user-supplied values):\n" - "\n" - "\t\t\tfrom:\n" - "\t\t\tto:\n" - "\t\t\tsubject:\n" - "\t\t\tattachment:\n" - "\t\t\ttag:\n" - "\t\t\tid:\n" - "\t\t\tthread:\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\tFor tag:, valid tag values include \"inbox\" and \"unread\"\n" - "\t\tby default for new messages added by \"notmuch new\" as well\n" - "\t\tas any other tag values added manually with \"notmuch tag\".\n" - "\n" - "\t\tFor id:, message ID values are the literal contents of the\n" - "\t\tMessage-ID: header of email messages, but without the '<','>'\n" - "\t\tdelimiters.\n" - "\n" - "\t\tThe thread: prefix can be used with the thread ID values that\n" - "\t\tare generated internally by notmuch (and do not appear in email\n" - "\t\tmessages). These thread ID values can be seen in the first\n" - "\t\tcolumn of output from \"notmuch search\".\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).\n" - "\n" - "\t\tFinally, results can be restricted to only messages within a\n" - "\t\tparticular time range, (based on the Date: header) with:\n" - "\n" - "\t\t\t..\n" - "\n" - "\t\tEach timestamp is a number representing the number of seconds\n" - "\t\tsince 1970-01-01 00:00:00 UTC. This is not the most convenient\n" - "\t\tmeans of expressing date ranges, but until notmuch is fixed to\n" - "\t\taccept a more convenient form, one can use the date program to\n" - "\t\tconstruct timestamps. For example, with the bash shell the\n" - "\t\tfollowing syntax would specify a date range to return messages\n" - "\t\tfrom 2009-10-01 until the current time:\n" - "\n" - "\t\t\t$(date +%%s -d 2009-10-01)..$(date +%%s)\n\n"; - -command_t commands[] = { +static command_t commands[] = { { "setup", notmuch_setup_command, NULL, - "Interactively setup notmuch for first use.", - "\t\tThe setup command will prompt for your full name, your primary\n" - "\t\temail address, any alternate email addresses you use, and the\n" - "\t\tdirectory containing your email archives. Your answers will be\n" - "\t\twritten to a configuration file in ${NOTMUCH_CONFIG} (if set)\n" - "\t\tor ${HOME}/.notmuch-config.\n" - "\n" - "\t\tThis configuration file will be created with descriptive\n" - "\t\tcomments, making it easy to edit by hand later to change the\n" - "\t\tconfiguration. Or you can run \"notmuch setup\" again.\n" - "\n" - "\t\tInvoking notmuch with no command argument will run setup if\n" - "\t\tthe setup command has not previously been completed." }, + "Interactively setup notmuch for first use." }, { "new", notmuch_new_command, - "[--verbose]", - "\t\tFind and import new messages to the notmuch database.", - "\t\tScans all sub-directories of the mail directory, performing\n" - "\t\tfull-text indexing on new messages that are found. Each new\n" - "\t\tmessage will be tagged as both \"inbox\" and \"unread\".\n" - "\n" - "\t\tYou should run \"notmuch new\" once after first running\n" - "\t\t\"notmuch setup\" to create the initial database. The first\n" - "\t\trun may take a long time if you have a significant amount of\n" - "\t\tmail (several hundred thousand messages or more).\n" - "\n" - "\t\tSubsequently, you should run \"notmuch new\" whenever new mail\n" - "\t\tis delivered and you wish to incorporate it into the database.\n" - "\t\tThese subsequent runs will be much quicker than the initial run.\n" - "\n" - "\t\tSupported options for new include:\n" - "\n" - "\t\t--verbose\n" - "\n" - "\t\t\tVerbose operation. Shows paths of message files as\n" - "\t\t\tthey are being indexed.\n" - "\n" - "\t\tInvoking notmuch with no command argument will run new if\n" - "\t\tthe setup command has previously been completed, but new has\n" - "\t\tnot previously been run." }, + "[options...]", + "Find and import new messages to the notmuch database." }, { "search", notmuch_search_command, "[options...] [...]", - "\t\tSearch for messages 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 (one per line) containing the matched messages.\n" - "\n" - "\t\tSupported options for search include:\n" - "\n" - "\t\t--sort=(newest-first|oldest-first)\n" - "\n" - "\t\t\tPresent results in either chronological order\n" - "\t\t\t(oldest-first) or reverse chronological order\n" - "\t\t\t(newest-first), which is the default.\n" - "\n" - "\t\tSee \"notmuch help search-terms\" for details of the search\n" - "\t\tterms syntax." }, + "Search for messages matching the given search terms." }, { "show", notmuch_show_command, " [...]", - "\t\tShow all messages matching the search terms.", - "\t\tThe messages are grouped and sorted based on the threading\n" - "\t\t(all replies to a particular message appear immediately\n" - "\t\tafter that message in date order).\n" - "\n" - "\t\tSupported options for show include:\n" - "\n" - "\t\t--entire-thread\n" - "\n" - "\t\t\tBy default only those messages that match the\n" - "\t\t\tsearch terms will be displayed. With this option,\n" - "\t\t\tall messages in the same thread as any matched\n" - "\t\t\tmessage will be displayed.\n" - "\n" - "\t\tThe output format is plain-text, with all text-content\n" - "\t\tMIME parts decoded. Various components in the output,\n" - "\t\t('message', 'header', 'body', 'attachment', and MIME 'part')\n" - "\t\tare delimited 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.\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:\" as can be seen in the first column\n" - "\t\tof output from the \"notmuch search\" command.\n" - "\n" - "\t\tSee \"notmuch help search-terms\" for details of the search\n" - "\t\tterms syntax." }, + "Show all messages matching the search terms." }, { "count", notmuch_count_command, - " [...]", - "\t\tCount messages matching the search terms.", - "\t\tThe number of matching messages is output to stdout.\n" - "\n" - "\t\tA common use of \"notmuch count\" is to display the count\n" - "\t\tof messages matching both a specific tag and either inbox\n" - "\t\tor unread\n" - "\n" - "\t\tSee \"notmuch help search-terms\" for details of the search\n" - "\t\tterms syntax." }, + "[options...] [...]", + "Count messages matching the search terms." }, { "reply", notmuch_reply_command, "[options...] [...]", - "\t\tConstruct a reply template for a set of messages.", - "\t\tConstructs a new message as a reply to a set of existing\n" - "\t\tmessages. The Reply-To: header (if any, otherwise From:) is\n" - "\t\tused for the To: address. The To: and Cc: headers are copied,\n" - "\t\tbut not including any of the user's configured addresses.\n" - "\n" - "\t\tA suitable subject is constructed. The In-Reply-to: and\n" - "\t\tReferences: headers are set appropriately, and the content\n" - "\t\tof the original messages is quoted and included in the body\n" - "\t\t(unless --format=headers-only is given).\n" - "\n" - "\t\tThe resulting message template is output to stdout.\n" - "\n" - "\t\tSupported options for reply include:\n" - "\n" - "\t\t--format=(default|headers-only)\n" - "\n" - "\t\t\tdefault:\n" - "\t\t\t\tIncludes subject and quoted message body.\n" - "\n" - "\t\t\theaders-only:\n" - "\t\t\t\tOnly produces In-Reply-To, References, To\n" - "\t\t\t\tCc, and Bcc headers.\n" - "\n" - "\t\tSee \"notmuch help search-terms\" for details of the search\n" - "\t\tterms syntax." }, + "Construct a reply template for a set of messages." }, { "tag", notmuch_tag_command, - "+|- [...] [--] [...]", - "\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\n" - "\t\t'-' are removed. For each message, tag removal is performed\n" - "\t\tbefore tag addition.\n" - "\n" - "\t\tThe beginning of 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\tSee \"notmuch help search-terms\" for details of the search\n" - "\t\tterms syntax." }, + "+|- [...] [--] [...]" , + "Add/remove tags for all messages matching the search terms." }, { "dump", notmuch_dump_command, - "[]", - "\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.)" }, + "[] [--] []", + "Create a plain-text dump of the tags for each message." }, { "restore", notmuch_restore_command, - "", - "\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)." }, - { "search-tags", notmuch_search_tags_command, - "[ [...] ]", - "\t\tList all tags found in the database or matching messages.", - "\t\tRun this command without any search-term(s) to obtain a list\n" - "\t\tof all tags found in the database. If you provide one or more\n" - "\t\tsearch-terms as argument(s) then the resulting list will\n" - "\t\tcontain tags only from messages that match the search-term(s).\n" - "\n" - "\t\tIn both cases the list will be alphabetically sorted." }, + "[--accumulate] []", + "Restore the tags from the given dump file (see 'dump')." }, + { "config", notmuch_config_command, + "[get|set]
. [value ...]", + "Get or set settings in the notmuch configuration file." }, { "help", notmuch_help_command, "[]", - "\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." } + "This message, or more detailed help for the named command." } }; static void @@ -292,70 +88,72 @@ usage (FILE *out) command_t *command; unsigned int i; - fprintf (out, "Usage: notmuch [args...]\n"); + fprintf (out, + "Usage: notmuch --help\n" + " notmuch --version\n" + " notmuch [args...]\n"); fprintf (out, "\n"); - fprintf (out, "Where and [args...] are as follows:\n"); + fprintf (out, "The available commands are as follows:\n"); fprintf (out, "\n"); for (i = 0; i < ARRAY_SIZE (commands); i++) { command = &commands[i]; - if (command->arguments) - fprintf (out, "\t%s\t%s\n\n%s\n\n", - command->name, command->arguments, command->summary); - else - fprintf (out, "\t%s\t%s\n\n", - command->name, command->summary); + fprintf (out, " %-11s %s\n", + command->name, command->summary); } + fprintf (out, "\n"); fprintf (out, - "Use \"notmuch help \" for more details on each command.\n" - "And \"notmuch help search-terms\" for the common search-terms syntax.\n\n"); + "Use \"notmuch help \" for more details on each command\n" + "and \"notmuch help search-terms\" for the common search-terms syntax.\n\n"); +} + +static void +exec_man (const char *page) +{ + if (execlp ("man", "man", page, (char *) NULL)) { + perror ("exec man"); + exit (1); + } } static int -notmuch_help_command (unused (void *ctx), int argc, char *argv[]) +notmuch_help_command (void *ctx, int argc, char *argv[]) { command_t *command; unsigned int i; + argc--; argv++; /* Ignore "help" */ + if (argc == 0) { printf ("The notmuch mail system.\n\n"); usage (stdout); return 0; } + if (strcmp (argv[0], "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 0; + } + for (i = 0; i < ARRAY_SIZE (commands); i++) { command = &commands[i]; if (strcmp (argv[0], command->name) == 0) { - printf ("Help for \"notmuch %s\":\n\n", argv[0]); - if (command->arguments) - printf ("\t%s\t%s\n\n%s\n\n%s\n\n", - command->name, command->arguments, - command->summary, command->documentation); - else - printf ("\t%s\t%s\n\n%s\n\n", command->name, - command->summary, command->documentation); - return 0; + char *page = talloc_asprintf (ctx, "notmuch-%s", command->name); + exec_man (page); } } if (strcmp (argv[0], "search-terms") == 0) { - printf ("Help for <%s>\n\n", argv[0]); - for (i = 0; i < ARRAY_SIZE (commands); i++) { - command = &commands[i]; - - if (command->arguments && - strstr (command->arguments, "search-terms")) - { - printf ("\t%s\t%s\n", - command->name, command->arguments); - } - } - printf ("\n"); - printf (search_terms_help); - return 0; + exec_man ("notmuch-search-terms"); + } else if (strcmp (argv[0], "hooks") == 0) { + exec_man ("notmuch-hooks"); } fprintf (stderr, @@ -433,20 +231,67 @@ main (int argc, char *argv[]) { void *local; command_t *command; - unsigned int i; + alias_t *alias; + unsigned int i, j; + const char **argv_local; + + talloc_enable_null_tracking (); local = talloc_new (NULL); g_mime_init (0); + g_type_init (); if (argc == 1) return notmuch (local); + if (STRNCMP_LITERAL (argv[1], "--help") == 0) + return notmuch_help_command (NULL, argc - 1, &argv[1]); + + if (STRNCMP_LITERAL (argv[1], "--version") == 0) { + printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n"); + return 0; + } + + for (i = 0; i < ARRAY_SIZE (aliases); i++) { + alias = &aliases[i]; + + if (strcmp (argv[1], alias->name) == 0) + { + int substitutions; + + argv_local = talloc_size (local, sizeof (char *) * + (argc + MAX_ALIAS_SUBSTITUTIONS - 1)); + if (argv_local == NULL) { + fprintf (stderr, "Out of memory.\n"); + return 1; + } + + /* Copy all substution arguments from the alias. */ + argv_local[0] = argv[0]; + for (j = 0; j < MAX_ALIAS_SUBSTITUTIONS; j++) { + if (alias->substitutions[j] == NULL) + break; + argv_local[j+1] = alias->substitutions[j]; + } + substitutions = j; + + /* And copy all original arguments (skipping the argument + * that matched the alias of course. */ + for (j = 2; j < (unsigned) argc; j++) { + argv_local[substitutions+j-1] = argv[j]; + } + + argc += substitutions - 1; + argv = (char **) argv_local; + } + } + for (i = 0; i < ARRAY_SIZE (commands); i++) { 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",