Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-18) (attachment inbox signed unread)
Subject: [notmuch] "notmuch help" outputs to stderr?
 Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-18) (attachment inbox signed)
 Subject: Re: [notmuch] "notmuch help" outputs to stderr?
 To: notmuch <notmuch@notmuchmail.org>
 Date: Tue, 17 Nov 2009 20:01:16 -0500

 [ multipart/mixed ]
 [ multipart/signed ]
 [ multipart/mixed ]
 [ text/plain ]
 > I've attached a patch that lets 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.

 Whoops, missed a couple of stderr's in that last patch.  New one
 attached.

 [ 4-line signature. Click/Enter to show. ]
 [ v2 of the selectable usage() stream patch: text/plain ]
 diff --git a/notmuch.c b/notmuch.c
 index c47e640..446c810 100644
 --- a/notmuch.c
 +++ b/notmuch.c
 @@ -157,23 +157,23 @@ command_t commands[] = {
  };

  static void
 -usage (void)
 +usage (FILE *out)
  {
      command_t *command;
      unsigned int i;

 -    fprintf (stderr, "Usage: notmuch <command> [args...]\n");
 -    fprintf (stderr, "\n");
 -    fprintf (stderr, "Where <command> and [args...] are as follows:\n");
 -    fprintf (stderr, "\n");
 +    fprintf (out, "Usage: notmuch <command> [args...]\n");
 +    fprintf (out, "\n");
 +    fprintf (out, "Where <command> and [args...] are as follows:\n");
 +    fprintf (out, "\n");

      for (i = 0; i < ARRAY_SIZE (commands); i++) {
	 command = &commands[i];

 -	fprintf (stderr, "\t%s\t%s\n\n", command->name, command->summary);
 +	fprintf (out, "\t%s\t%s\n\n", command->name, command->summary);
      }

 -    fprintf (stderr, "Use \"notmuch help <command>\" for more details on
 each command.\n\n");
 +    fprintf (out, "Use \"notmuch help <command>\" for more details on each
 command.\n\n");
  }

  static int
 @@ -183,8 +183,8 @@ notmuch_help_command (unused (void *ctx), int argc, char
 *argv[])
      unsigned int i;

      if (argc == 0) {
 -	fprintf (stderr, "The notmuch mail system.\n\n");
 -	usage ();
 +	fprintf (stdout, "The notmuch mail system.\n\n");
 +	usage (stdout);
	 return 0;
      }

 @@ -192,8 +192,8 @@ notmuch_help_command (unused (void *ctx), int argc, char
 *argv[])
	 command = &commands[i];

	 if (strcmp (argv[0], command->name) == 0) {
 -	    fprintf (stderr, "Help for \"notmuch %s\":\n\n", argv[0]);
 -	    fprintf (stderr, "\t%s\t%s\n\n%s\n\n", command->name,
 +	    fprintf (stdout, "Help for \"notmuch %s\":\n\n", argv[0]);
 +	    fprintf (stdout, "\t%s\t%s\n\n%s\n\n", command->name,
		      command->summary, command->documentation);
	     return 0;
	 }
 [ application/pgp-signature ]
 [ text/plain ]
 [ 4-line signature. Click/Enter to show. ]