Author: eadler
Date: Fri Jul  4 22:19:21 2014
New Revision: 268271
URL: http://svnweb.freebsd.org/changeset/base/268271

Log:
  units(1): Add 'help' flag
        - Add support for --help for compatibility
        - Make usage() static

Modified:
  head/usr.bin/units/units.1
  head/usr.bin/units/units.c

Modified: head/usr.bin/units/units.1
==============================================================================
--- head/usr.bin/units/units.1  Fri Jul  4 21:34:48 2014        (r268270)
+++ head/usr.bin/units/units.1  Fri Jul  4 22:19:21 2014        (r268271)
@@ -13,6 +13,8 @@
 .Sh OPTIONS
 The following options are available:
 .Bl -tag -width indent
+.It Fl h No , Fl -help
+Show an overview of options
 .It Fl f Ar filename No , Fl -file Ar filename
 Specify the name of the units data file to load.
 .It Fl q No , Fl -quiet

Modified: head/usr.bin/units/units.c
==============================================================================
--- head/usr.bin/units/units.c  Fri Jul  4 21:34:48 2014        (r268270)
+++ head/usr.bin/units/units.c  Fri Jul  4 22:19:21 2014        (r268271)
@@ -695,7 +695,7 @@ showanswer(struct unittype * have, struc
 }
 
 
-void 
+static void 
 usage(void)
 {
        fprintf(stderr,
@@ -704,6 +704,7 @@ usage(void)
 }
 
 static struct option longopts[] = {
+       {"help", no_argument, NULL, 'h'},
        {"file", required_argument, NULL, 'f'},
        {"quiet", no_argument, NULL, 'q'},
        {"verbose", no_argument, NULL, 'v'},
@@ -728,7 +729,7 @@ main(int argc, char **argv)
 
        quiet = false;
        readfile = false;
-       while ((optchar = getopt_long(argc, argv, "+f:qvUV", longopts, NULL)) 
!= -1) {
+       while ((optchar = getopt_long(argc, argv, "+hf:qvUV", longopts, NULL)) 
!= -1) {
                switch (optchar) {
                case 'f':
                        readfile = true;
@@ -753,6 +754,9 @@ main(int argc, char **argv)
                                printf("Units data file not found");
                        exit(0);
                        break;
+               case 'h':
+                       /* FALLTHROUGH */
+
                default:
                        usage();
                }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to