Changeset f350fc3 for owl.c

Timestamp:

Sep 14, 2009, 9:17:49 AM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

4e4847c

Parents:

799f36c

git-author:

Nelson Elhage <nelhage@mit.edu> (09/13/09 20:18:06)

git-committer:

Nelson Elhage <nelhage@mit.edu> (09/14/09 09:17:49)

Message:

Add equivalent long options for all short options.

File:

• owl.c (modified) (3 diffs)

owl.c

@@ -9 +9 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <getopt.h>
 #include <stdlib.h>
 #include <string.h>
@@ -47 +48 @@
 /* TODO: free owl_options after init is done? */
 void owl_parse_options(int argc, char *argv[], owl_options *opts) /* noproto */ {
+  static const struct option long_options[] = {
+    { "no-subs",         0, 0, 'n' },
+    { "config-file",     1, 0, 'c' },
+    { "config-dir",      1, 0, 's' },
+    { "tty",             1, 0, 't' },
+    { "debug",           0, 0, 'd' },
+    { "remove-debug",    0, 0, 'D' },
+    { "version",         0, 0, 'v' },
+    { "help",            0, 0, 'h' },
+    { NULL, 0, NULL, 0}
+  };
   char c;
 
-  while((c = getopt(argc, argv, "nc:t:s:dDvh")) != -1) {
+  while((c = getopt_long(argc, argv, "nc:t:s:dDvh",
+                         long_options, NULL)) != -1) {
     switch(c) {
     case 'n':
@@ -650 +663 @@
   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      don't load zephyr subscriptions\n");
-  fprintf(stderr, "  -d      enable debugging\n");
-  fprintf(stderr, "  -D      enable debugging and delete previous debug file\n");
-  fprintf(stderr, "  -v      print the Barnowl version number and exit\n");
-  fprintf(stderr, "  -h      print this help message\n");
-  fprintf(stderr, "  -c      specify an alternate config file\n");
-  fprintf(stderr, "  -s      specify an alternate config dir (default ~/.owl)\n");
-  fprintf(stderr, "  -t      set the tty name\n");
+  fprintf(stderr, "  -n,--no-subs        don't load zephyr subscriptions\n");
+  fprintf(stderr, "  -d,--debug          enable debugging\n");
+  fprintf(stderr, "  -D,--remove-debug   enable debugging and delete previous debug file\n");
+  fprintf(stderr, "  -v,--version        print the Barnowl version number and exit\n");
+  fprintf(stderr, "  -h,--help           print this help message\n");
+  fprintf(stderr, "  -c,--config-file    specify an alternate config file\n");
+  fprintf(stderr, "  -s,--config-dir     specify an alternate config dir (default ~/.owl)\n");
+  fprintf(stderr, "  -t,--tty            set the tty name\n");
 }