diff options
| -rw-r--r-- | usr.bin/units/units.1 | 6 | ||||
| -rw-r--r-- | usr.bin/units/units.c | 12 |
2 files changed, 7 insertions, 11 deletions
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1 index a7371c1..2ce1000 100644 --- a/usr.bin/units/units.1 +++ b/usr.bin/units/units.1 @@ -8,7 +8,7 @@ .Sh SYNOPSIS .Nm .Op Fl f Ar filename -.Op Fl qv +.Op Fl qV .Op Ar from-unit to-unit .Sh OPTIONS The following options are available: @@ -18,8 +18,8 @@ Specify the name of the units data file to load. .It Fl q Suppress prompting of the user for units and the display of statistics about the number of units loaded. -.It Fl v -Print the version number. +.It Fl V +Print the version number, usage, and then exit. .It Ar from-unit to-unit Allow a single unit conversion to be done directly from the command line. diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c index b1a04f7..2a099ce 100644 --- a/usr.bin/units/units.c +++ b/usr.bin/units/units.c @@ -32,8 +32,6 @@ static const char rcsid[] = #include "pathnames.h" -#define VERSION "1.0" - #ifndef UNITSFILE #define UNITSFILE _PATH_UNITSLIB #endif @@ -689,7 +687,7 @@ main(int argc, char **argv) char *userfile = 0; int quiet = 0; - while ((optchar = getopt(argc, argv, "vqf:")) != -1) { + while ((optchar = getopt(argc, argv, "Vqf:")) != -1) { switch (optchar) { case 'f': userfile = optarg; @@ -697,14 +695,12 @@ main(int argc, char **argv) case 'q': quiet = 1; break; - case 'v': - fprintf(stderr, "\n units version %s Copyright (c) 1993 by Adrian Mariano\n", - VERSION); - fprintf(stderr, " This program may be freely distributed\n"); + case 'V': + fprintf(stderr, "FreeBSD units\n"); usage(); + break; default: usage(); - break; } } |
