X-Git-Url: https://git.distorted.org.uk/~mdw/xtoys/blobdiff_plain/cc52f3b6f297a8af8377a11925f789db126fea89..3a4bdbcb848307f089c1dc06b63a0b7e3a43978b:/xscsize.c

diff --git a/xscsize.c b/xscsize.c
index dcdbbd1..0cd4cbd 100644
--- a/xscsize.c
+++ b/xscsize.c
@@ -35,34 +35,42 @@
 #include <mLib/mdwopt.h>
 #include <mLib/quis.h>
 
+/*----- Static variables --------------------------------------------------*/
+
+static unsigned int flags = 0;
+#define F_SH 1u
+#define F_CSH 2u
+#define F_SHELL 3u
+#define F_EXPORT 4u
+
 /*----- Main code ---------------------------------------------------------*/
 
 static void version(FILE *fp)
-  { fprintf(fp, "%s (xtoys version " VERSION ")\n", QUIS); }
+  { pquis(fp, "$ (xtoys version " VERSION ")\n"); }
 
 static void usage(FILE *fp)
-  { fprintf(fp, "Usage: %s [-bcx] [-d display]\n", QUIS); }
+  { pquis(fp, "Usage: $ [-bcx] [-d DISPLAY]\n"); }
 
 static void help(FILE *fp)
 {
   version(fp);
   fputc('\n', fp);
   usage(stdout);
-  fputs("\n"
-"Reads the size of the X root window and outputs it in a form suitable\n"
-"for use as a shell assignment statement, defining variables XWIDTH and\n"
-"XHEIGHT.\n"
-"\n"
-"Options:\n"
-"\n"
-"-h, --help		Display this help text\n"
-"-u, --usage		Display a short usage summary\n"
-"-v, --version		Display the program's version number\n"
-"\n"
-"-d, --display=DISPLAY	Choose X display to connect to\n"
-"-b, --bourne-shell	Output text suitable for a Bourne shell\n"
-"-c, --c-shell		Output text suitable for a C shell\n"
-"-x, --export		Export the variables into the environment\n",
+  fputs("\n\
+Reads the size of the X root window and outputs it in a form suitable\n\
+for use as a shell assignment statement, defining variables XWIDTH and\n\
+XHEIGHT.\n\
+\n\
+Options:\n\
+\n\
+-h, --help		Display this help text\n\
+-u, --usage		Display a short usage summary\n\
+-v, --version		Display the program's version number\n\
+\n\
+-d, --display=DISPLAY	Choose X display to connect to\n\
+-b, --bourne-shell	Output text suitable for a Bourne shell\n\
+-c, --c-shell		Output text suitable for a C shell\n\
+-x, --export		Export the variables into the environment\n",
 	fp);
 }
 
@@ -75,10 +83,7 @@ int main(int argc, char *argv[])
   unsigned long wd, ht;
   int sc;
 
-#define f_sh 1u
-#define f_csh 2u
-#define f_shell 3u
-#define f_export 4u
+#define f_bogus 1u
 
   /* --- Parse command line options --- */
 
@@ -86,69 +91,47 @@ int main(int argc, char *argv[])
 
   for (;;) {
     static struct option opt[] = {
-      { "help", 	0,		0,	'h' },
-      { "usage", 	0,		0,	'u' },
-      { "version", 	0,		0,	'v' },
-      { "display", 	OPTF_ARGREQ,	0,	'd' },
+      { "help",		0,		0,	'h' },
+      { "usage",	0,		0,	'u' },
+      { "version",	0,		0,	'v' },
+      { "display",	OPTF_ARGREQ,	0,	'd' },
       { "bourne-shell",	0,		0,	'b' },
       { "c-shell",	0,		0,	'c' },
       { "export",	0,		0,	'x' },
       {	0,		0,		0,	0 }
     };
 
-    int i = getopt_long(argc, argv, "huv d:bcx", opt, 0);
-    if (i < 0)
-      break;
+    int i = getopt_long(argc, argv, "huv" "d:bcx", opt, 0);
+    if (i < 0) break;
     switch (i) {
-      case 'h':
-	help(stdout);
-	exit(0);
-	break;
-      case 'u':
-	usage(stdout);
-	exit(0);
-	break;
-      case 'v':
-	version(stdout);
-	exit(0);
-	break;
-
-      case 'd':
-	display = optarg;
-	break;
-      case 'b':
-	f |= f_sh;
-	break;
-      case 'c':
-	f |= f_csh;
-	break;
-      case 'x':
-	f |= f_export;
-	break;
-      default:
-	usage(stderr);
-	exit(EXIT_FAILURE);
-	break;
+      case 'h': help(stdout); exit(0); break;
+      case 'u': usage(stdout); exit(0); break;
+      case 'v': version(stdout); exit(0); break;
+      case 'd': display = optarg; break;
+      case 'b': flags |= F_SH; break;
+      case 'c': flags |= F_CSH; break;
+      case 'x': flags |= F_EXPORT; break;
+      default: f |= f_bogus; break;
     }
   }
 
+  if (optind < argc) f |= f_bogus;
+  if (f & f_bogus) { usage(stderr); exit(EXIT_FAILURE); }
+
   /* --- Sort out the shell type --- *
    *
    * If the shell name contains the string `csh' then assume it's a C shell.
    * Otherwise assume it's Bourne.  This seems to work in practice.
    */
 
-  if (!(f & f_shell)) {
+  if (!(flags & F_SHELL)) {
     s = getenv("SHELL");
-    if (!s)
-      f |= f_sh;
-    if (strstr(s, "csh"))
-      f |= f_csh;
-    else
-      f |= f_sh;
+    if (!s) flags |= F_SH;
+    if (strstr(s, "csh")) flags |= F_CSH;
+    else flags |= F_SH;
   }
 
-  if ((f & f_sh) && (f & f_csh)) {
+  if ((flags & F_SH) && (flags & F_CSH)) {
     fprintf(stderr, "xscsize: make your mind up about your shell type\n");
     exit(EXIT_FAILURE);
   }