sync with OpenBSD -current

app/bitmap/BitEdit.c

@@ -30,8 +30,9 @@ from The Open Group.
  * Author:  Davor Matic, MIT X Consortium
  */
 
-
-
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -67,6 +68,8 @@ where options include all standard toolkit options plus:\n\
      -stipple filename\n\
      -hl color\n\
      -fr color\n\
+     -help\n\
+     -version\n\
 \n\
 The default WIDTHxHEIGHT is 16x16.\n";
 
@@ -977,13 +980,41 @@ int main(int argc, char *argv[])
     Widget w;
     Widget radio_group = NULL;
     XtPointer radio_data = NULL;
+    const char *filename = NULL;
+
+    /* Handle args that don't require opening a display */
+    for (int a = 1; a < argc; a++) {
+	const char *argn = argv[a];
+	/* accept single or double dash for -help & -version */
+	if (argn[0] == '-' && argn[1] == '-') {
+	    argn++;
+	}
+	if (strcmp(argn, "-help") == 0) {
+	    fprintf(stderr, "usage: %s %s", argv[0], usage);
+	    exit(0);
+	}
+	if (strcmp(argn, "-version") == 0) {
+	    puts(PACKAGE_STRING);
+	    exit(0);
+	}
+    }
 
     top_widget = XtInitialize(NULL, "Bitmap",
 			      options, XtNumber(options), &argc, argv);
 
-    if (argc > 2) {
-	fputs(usage, stderr);
-	exit (0);
+    if (argc > 1) {
+	if ((argv[argc - 1][0] != '-') && (argv[argc - 1][0] != '+')) {
+	    filename = argv[--argc];
+	}
+	if (argc > 1) {
+	    fputs("Unknown argument(s):", stderr);
+	    for (int a = 1; a < argc; a++) {
+		fprintf(stderr, " %s", argv[a]);
+	    }
+	    fputs("\n\n", stderr);
+	    fprintf(stderr, "usage: %s %s", argv[0], usage);
+	    exit (1);
+	}
     }
 
     check_mark = XCreateBitmapFromData(XtDisplay(top_widget),
@@ -1075,8 +1106,8 @@ int main(int argc, char *argv[])
     bitmap_widget = XtCreateManagedWidget("bitmap", bitmapWidgetClass,
 					  pane_widget, NULL, 0);
     XtRealizeWidget(top_widget);
-    if (argc > 1)
-      if (BWReadFile(bitmap_widget, argv[1], NULL))
+    if (filename != NULL)
+        BWReadFile(bitmap_widget, filename, NULL);
 
     wm_delete_window = XInternAtom(XtDisplay(top_widget), "WM_DELETE_WINDOW",
 				   False);