Add -help and -version options

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

2 files changed, 29 insertions, 6 deletions

diff --git a/init.c b/init.c
index 0b6af54..bf84ba0 100644
--- a/init.c
+++ b/init.c
@@ -173,11 +173,13 @@ static XrmOptionDescRec table[] = {
 };
 
 /* Tell the user how to use this program. */
-static void Syntax(char *call)
+static void Syntax(const char *call, int exitval)
 {
-    (void) fprintf(stderr, "usage: %s [-path <path>] [-initial <folder>]\n",
-		   call);
-    exit(2);
+    fprintf(stderr,
+	    "usage: %s [-path <path>] [-initial <folder>] [toolkit options]\n"
+	    "       %s [-help|-version]\n",
+	    call, call);
+    exit(exitval);
 }
 
 
@@ -368,6 +370,22 @@ void InitializeWorld(int argc, char **argv)
     if (ptr) progName = ptr + 1;
     else progName = argv[0];
 
+    /* Handle args that don't require opening a display */
+    for (int n = 1; n < argc; n++) {
+        const char *argn = argv[n];
+        /* accept single or double dash for -help & -version */
+        if (argn[0] == '-' && argn[1] == '-') {
+            argn++;
+        }
+        if (strcmp(argn, "-help") == 0) {
+            Syntax(progName, 0);
+        }
+        if (strcmp(argn, "-version") == 0) {
+            puts(PACKAGE_STRING);
+            exit(0);
+        }
+    }
+
     shell_args[2].value = (XtArgVal)environ;
     toplevel = XtOpenApplication(&app, "Xmh", table, XtNumber(table),
 				 &argc, argv, FallbackResources,
@@ -379,7 +397,7 @@ void InitializeWorld(int argc, char **argv)
 	    fprintf(stderr, " %s", argv[n]);
 	}
 	fputs("\n\n", stderr);
-	Syntax(progName);
+	Syntax(progName, 2);
     }
 
     XSetIOErrorHandler(_IOErrorHandler);
diff --git a/man/xmh.man b/man/xmh.man
index a87cd59..ef26eef 100644
--- a/man/xmh.man
+++ b/man/xmh.man
@@ -74,7 +74,12 @@ These three options have corresponding application-specific resources,
 can be specified in a resource file.
 .PP
 The standard toolkit command line options are given in \fIX(__miscmansuffix__)\fP.
-
+.TP 8
+.B \-help
+This option indicates that \fIxmh\fP should print a usage message and exit.
+.TP 8
+.B \-version
+This option indicates that \fIxmh\fP should print version info and exit.
 .SH INSTALLATION
 .PP
 \fIxmh\fR requires that the user is already set up