units(1): Add 'help' flag

	- Add support for --help for compatibility
	- Make usage() static

2 files changed, 8 insertions, 2 deletions

diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index c5a82ca23046..7e88efb8b86f 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -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
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index a0e3772c7025..baf2a5942391 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -695,7 +695,7 @@ showanswer(struct unittype * have, struct unittype * want)
 }
 
 
-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();
 		}