Handle -h and --help according to GNU Coding Standards (#17104)

Added -h instead of -?.  And upon -h and --help, write usave to stdout
instead of stdin, and return 0 instead of 1.

-? still works like before as that's what getopt returns upon unknown
arguments.

2 files changed, 26 insertions, 22 deletions

diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
index 05bf7746..5ed8deff 100644
--- a/fc-match/fc-match.c
+++ b/fc-match/fc-match.c
@@ -53,7 +53,7 @@ static const struct option longopts[] = {
     {"all", 0, 0, 'a'},
     {"version", 0, 0, 'V'},
     {"verbose", 0, 0, 'v'},
-    {"help", 0, 0, '?'},
+    {"help", 0, 0, 'h'},
     {NULL,0,0,0},
 };
 #else
@@ -63,31 +63,33 @@ extern int optind, opterr, optopt;
 #endif
 #endif
 
-static void usage (char *program)
+static void
+usage (char *program, int error)
 {
+    FILE *file = error ? stderr : stdout;
 #if HAVE_GETOPT_LONG
-    fprintf (stderr, "usage: %s [-savV?] [--sort] [--all] [--verbose] [--version] [--help] [pattern]\n",
+    fprintf (file, "usage: %s [-savVh] [--sort] [--all] [--verbose] [--version] [--help] [pattern]\n",
 	     program);
 #else
-    fprintf (stderr, "usage: %s [-savV?] [pattern]\n",
+    fprintf (file, "usage: %s [-savVh] [pattern]\n",
 	     program);
 #endif
-    fprintf (stderr, "List fonts matching [pattern]\n");
-    fprintf (stderr, "\n");
+    fprintf (file, "List fonts matching [pattern]\n");
+    fprintf (file, "\n");
 #if HAVE_GETOPT_LONG
-    fprintf (stderr, "  -s, --sort           display sorted list of matches\n");
-    fprintf (stderr, "  -a, --all            display unpruned sorted list of matches\n");
-    fprintf (stderr, "  -v, --verbose        display entire font pattern\n");
-    fprintf (stderr, "  -V, --version        display font config version and exit\n");
-    fprintf (stderr, "  -?, --help           display this help and exit\n");
+    fprintf (file, "  -s, --sort           display sorted list of matches\n");
+    fprintf (file, "  -a, --all            display unpruned sorted list of matches\n");
+    fprintf (file, "  -v, --verbose        display entire font pattern\n");
+    fprintf (file, "  -V, --version        display font config version and exit\n");
+    fprintf (file, "  -h, --help           display this help and exit\n");
 #else
-    fprintf (stderr, "  -s,        (sort)    display sorted list of matches\n");
-    fprintf (stderr, "  -a         (all)     display unpruned sorted list of matches\n");
-    fprintf (stderr, "  -v         (verbose) display entire font pattern\n");
-    fprintf (stderr, "  -V         (version) display font config version and exit\n");
-    fprintf (stderr, "  -?         (help)    display this help and exit\n");
+    fprintf (file, "  -s,        (sort)    display sorted list of matches\n");
+    fprintf (file, "  -a         (all)     display unpruned sorted list of matches\n");
+    fprintf (file, "  -v         (verbose) display entire font pattern\n");
+    fprintf (file, "  -V         (version) display font config version and exit\n");
+    fprintf (file, "  -h         (help)    display this help and exit\n");
 #endif
-    exit (1);
+    exit (error);
 }
 
 int
@@ -103,9 +105,9 @@ main (int argc, char **argv)
     int		c;
 
 #if HAVE_GETOPT_LONG
-    while ((c = getopt_long (argc, argv, "asVv?", longopts, NULL)) != -1)
+    while ((c = getopt_long (argc, argv, "asVvh", longopts, NULL)) != -1)
 #else
-    while ((c = getopt (argc, argv, "asVv?")) != -1)
+    while ((c = getopt (argc, argv, "asVvh")) != -1)
 #endif
     {
 	switch (c) {
@@ -122,8 +124,10 @@ main (int argc, char **argv)
 	case 'v':
 	    verbose = 1;
 	    break;
+	case 'h':
+	    usage (argv[0], 0);
 	default:
-	    usage (argv[0]);
+	    usage (argv[0], 1);
 	}
     }
     i = optind;
diff --git a/fc-match/fc-match.sgml b/fc-match/fc-match.sgml
index c2f699d5..b5ca6756 100644
--- a/fc-match/fc-match.sgml
+++ b/fc-match/fc-match.sgml
@@ -63,7 +63,7 @@ manpage.1: manpage.sgml
     <cmdsynopsis>
       <command>&dhpackage;</command>
 
-      <arg><option>-asvV?</option></arg>
+      <arg><option>-asvVh</option></arg>
       <arg><option>--all</option></arg>
       <arg><option>--sort</option></arg>
       <arg><option>--verbose</option></arg>
@@ -103,7 +103,7 @@ are printed.  The <option>--all</option> option works like
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>-?</option>
+        <term><option>-h</option>
           <option>--help</option>
         </term>
         <listitem>