debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-03 15:21:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch help: Print to stdout, not to stderr.

Browse source 
Let usage() take a FILE * argument so that you can output to stderr in
response to usage errors, and stdout in response to an explicit
request.
This commit is contained in:
Lars Kellogg-Stedman 2009-11-17 20:01:16 -05:00 committed by Carl Worth
parent 306635c27d
commit 9d69e332fa
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
notmuch.c
View file

@ -238,28 +238,28 @@ command_t commands[] = {
}; };
static void static void
usage (void) usage (FILE *out)
{ {
command_t *command; command_t *command;
unsigned int i; unsigned int i;
fprintf (stderr, "Usage: notmuch <command> [args...]\n"); fprintf (out, "Usage: notmuch <command> [args...]\n");
fprintf (stderr, "\n"); fprintf (out, "\n");
fprintf (stderr, "Where <command> and [args...] are as follows:\n"); fprintf (out, "Where <command> and [args...] are as follows:\n");
fprintf (stderr, "\n"); fprintf (out, "\n");
for (i = 0; i < ARRAY_SIZE (commands); i++) { for (i = 0; i < ARRAY_SIZE (commands); i++) {
command = &commands[i]; command = &commands[i];
if (command->arguments) if (command->arguments)
fprintf (stderr, "\t%s\t%s\n\n%s\n\n", fprintf (out, "\t%s\t%s\n\n%s\n\n",
command->name, command->arguments, command->summary); command->name, command->arguments, command->summary);
else else
fprintf (stderr, "\t%s\t%s\n\n", fprintf (out, "\t%s\t%s\n\n",
command->name, command->summary); command->name, command->summary);
} }
fprintf (stderr, fprintf (out,
"Use \"notmuch help <command>\" for more details on each command.\n" "Use \"notmuch help <command>\" for more details on each command.\n"
"And \"notmuch help search-terms\" for the common search-terms syntax.\n\n"); "And \"notmuch help search-terms\" for the common search-terms syntax.\n\n");
} }
@ -271,8 +271,8 @@ notmuch_help_command (unused (void *ctx), int argc, char *argv[])
unsigned int i; unsigned int i;
if (argc == 0) { if (argc == 0) {
fprintf (stderr, "The notmuch mail system.\n\n"); printf ("The notmuch mail system.\n\n");
usage (); usage (stdout);
return 0; return 0;
} }
@ -280,32 +280,32 @@ notmuch_help_command (unused (void *ctx), int argc, char *argv[])
command = &commands[i]; command = &commands[i];
if (strcmp (argv[0], command->name) == 0) { if (strcmp (argv[0], command->name) == 0) {
fprintf (stderr, "Help for \"notmuch %s\":\n\n", argv[0]); printf ("Help for \"notmuch %s\":\n\n", argv[0]);
if (command->arguments) if (command->arguments)
fprintf (stderr, "\t%s\t%s\n\n%s\n\n%s\n\n", printf ("\t%s\t%s\n\n%s\n\n%s\n\n",
command->name, command->arguments, command->name, command->arguments,
command->summary, command->documentation); command->summary, command->documentation);
else else
fprintf (stderr, "\t%s\t%s\n\n%s\n\n", command->name, printf ("\t%s\t%s\n\n%s\n\n", command->name,
command->summary, command->documentation); command->summary, command->documentation);
return 0; return 0;
} }
} }
if (strcmp (argv[0], "search-terms") == 0) { if (strcmp (argv[0], "search-terms") == 0) {
fprintf (stderr, "Help for <%s>\n\n", argv[0]); printf ("Help for <%s>\n\n", argv[0]);
for (i = 0; i < ARRAY_SIZE (commands); i++) { for (i = 0; i < ARRAY_SIZE (commands); i++) {
command = &commands[i]; command = &commands[i];
if (command->arguments && if (command->arguments &&
strstr (command->arguments, "search-terms")) strstr (command->arguments, "search-terms"))
{ {
fprintf (stderr, "\t%s\t%s\n", printf ("\t%s\t%s\n",
command->name, command->arguments); command->name, command->arguments);
} }
} }
fprintf (stderr, "\n"); printf ("\n");
fprintf (stderr, search_terms_help); printf (search_terms_help);
return 0; return 0;
} }