Changeset 499224d

Timestamp:

Apr 19, 2013, 3:22:54 AM (11 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10

Children:

478dc8e

Parents:

a223b6b

git-author:

Anders Kaseorg <andersk@mit.edu> (04/09/13 18:53:33)

git-committer:

Anders Kaseorg <andersk@mit.edu> (04/19/13 03:22:54)

Message:

barnowl --help: Write to stdout and exit successfully

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• owl.c (modified) (2 diffs)

owl.c

@@ -34 +34 @@
 } owl_options;
 
-void usage(void)
+void usage(FILE *file)
 {
-  fprintf(stderr, "Barnowl version %s\n", OWL_VERSION_STRING);
-  fprintf(stderr, "Usage: barnowl [-n] [-d] [-D] [-v] [-h] [-c <configfile>] [-s <confdir>] [-t <ttyname>]\n");
-  fprintf(stderr, "  -n,--no-subs        don't load zephyr subscriptions\n");
-  fprintf(stderr, "  -d,--debug          enable debugging\n");
-  fprintf(stderr, "  -v,--version        print the Barnowl version number and exit\n");
-  fprintf(stderr, "  -h,--help           print this help message\n");
-  fprintf(stderr, "  -s,--config-dir     specify an alternate config dir (default ~/.owl)\n");
-  fprintf(stderr, "  -c,--config-file    specify an alternate config file (default ~/.owl/init.pl)\n");
-  fprintf(stderr, "  -t,--tty            set the tty name\n");
+  fprintf(file, "Barnowl version %s\n", OWL_VERSION_STRING);
+  fprintf(file, "Usage: barnowl [-n] [-d] [-D] [-v] [-h] [-c <configfile>] [-s <confdir>] [-t <ttyname>]\n");
+  fprintf(file, "  -n,--no-subs        don't load zephyr subscriptions\n");
+  fprintf(file, "  -d,--debug          enable debugging\n");
+  fprintf(file, "  -v,--version        print the Barnowl version number and exit\n");
+  fprintf(file, "  -h,--help           print this help message\n");
+  fprintf(file, "  -s,--config-dir     specify an alternate config dir (default ~/.owl)\n");
+  fprintf(file, "  -c,--config-file    specify an alternate config file (default ~/.owl/init.pl)\n");
+  fprintf(file, "  -t,--tty            set the tty name\n");
 }
 
@@ -83 +83 @@
       exit(0);
     case 'h':
+      usage(stdout);
+      exit(0);
     default:
-      usage();
+      usage(stderr);
       exit(1);
     }