Commit: a784c945a39524e7d248c53f38c0dc13dcd8ce0d - mingw-catgets (git)

POSIX.1 National Language Support API for MinGW

Commit MetaInfo

• Revision: a784c945a39524e7d248c53f38c0dc13dcd8ce0d (tree)
• Zeit: 2008-01-13 03:01:42
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

* gencat.c: Force an abort, with appropriate diagnostic, on parsing an unrecognised command line option.

Ändern Zusammenfassung

• modified: ChangeLog
• modified: gencat.c

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	* gencat.c: Force an abort, with appropriate diagnostic, on parsing an
+	unrecognised command line option.
+
 2008-01-11  Keith Marshall  <[e-mail]>
 
 	Make replacement `getopt' function module more GNU compatible.

--- a/gencat.c
+++ b/gencat.c
@@ -8,7 +8,7 @@
  * This file implements the `main' function for the `gencat' program.
  *
  * Written by Keith Marshall  <[e-mail]>
- * Last modification: 09-Jan-2008
+ * Last modification: 12-Jan-2008
  *
  *
  * This is free software.  It is provided AS IS, in the hope that it may
@@ -175,12 +175,20 @@ int main( int argc, char **argv )
 	 */
 	banner_printf( print_top_banner + print_nl_duplicate, COPYRIGHT_NOTICE );
 	exit( EXIT_SUCCESS );
+
+      case '?':
+	/*
+	 * This means the user specified an unrecognised option...
+	 * continue parsing, to catch other possible errors, but flag it,
+	 * so we can bail out before processing any message catalogue.
+	 */
+	gencat_errno = opt;
     }
 
   progname = *argv;
   cat_index.id = tag;
 
-  if( (argc -= optind) > 1 )
+  if( ((argc -= optind) > 1) && (gencat_errno == 0) )
   {
     /* Establish the message catalogue name, recognising `/dev/stdout'
      * as an alias for `-', representing the standard output stream.
@@ -381,10 +389,18 @@ int main( int argc, char **argv )
   }
 
   else
-  { /* User specified insufficient command line arguments.
-     * Diagnose, and bail out.
+  { /* An error was detected, while parsing the command line...
+     */
+    if( argc < 2 )
+      /*
+       * User specified insufficient command line arguments.
+       */
+      fprintf( errmsg( MSG_MISSING_ARGS ), progname );
+
+    /* In any case, (it may have been an unrecognised option,
+     * which was previously diagnosed), display the usage summary,
+     * and bail out.
      */
-    fprintf( errmsg( MSG_MISSING_ARGS ), progname );
     fprintf( errmsg( MSG_GENCAT_USAGE ), progname );
     return EXIT_FAILURE;
   }
@@ -393,4 +409,4 @@ int main( int argc, char **argv )
   return EXIT_SUCCESS;
 }
 
-/* $RCSfile$Revision: 1.5 $: end of file */
+/* $RCSfile$Revision: 1.6 $: end of file */