コミット: 4169903111ce12e8fc3edd929d1b6d50bb7848d4 - mingw-catgets (git)

POSIX.1 National Language Support API for MinGW

コミットメタ情報

• リビジョン: 4169903111ce12e8fc3edd929d1b6d50bb7848d4 (tree)
• 日時: 2008-01-12 08:38:46
• 作者: Keith Marshall <keithmarshall@user...>
• コミッター: Keith Marshall

ログメッセージ

Make replacement getopt' function module more GNU compatible.

変更サマリ

• modified: ChangeLog
• modified: repl/getopt.c

差分

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Make replacement `getopt' function module more GNU compatible.
+
+	* repl/getopt.c (optind): Initialise to one; POSIX requires this.
+	(getopt_parse): Handle changed initial value for `optind'; allow
+	caller to reset the parser, by setting `optind = 0'.
+
 2008-01-10  Keith Marshall  <[e-mail]>
 
 	* gencat.c: Delay writing the catalogue header until *after* the

--- a/repl/getopt.c
+++ b/repl/getopt.c
@@ -9,7 +9,7 @@
  * This file is part of the MinGW32 package set.
  *
  * Contributed by Keith Marshall <[e-mail]>
- * Last modification: 27-Dec-2007
+ * Last modification: 11-Jan-2008
  *
  * THIS SOFTWARE IS NOT COPYRIGHTED
  *
@@ -49,7 +49,7 @@ extern char __declspec(dllimport) *__progname;
 
 /* Initialise the public variables. */
 
-int optind = 0;				/* index for first non-option arg     */
+int optind = 1;				/* index for first non-option arg     */
 int opterr = 1;				/* enable built-in error messages     */
 
 char *optarg = NULL;			/* pointer to current option argument */
@@ -306,6 +306,19 @@ int getopt_parse( int mode, getopt_std_args, ... )
   static const CHAR *nextchar = NULL;
   static int optmark = 0;
 
+  if( (argind == 0) || (optind == 0) )
+  {
+    /* POSIX wants `optind' to have an initial value of one, but we want
+     * it to be initialised to zero, when we are called for the first time,
+     * (as indicated by `argind' having a value of zero).  We also want to
+     * allow the caller to reset the `getopt' parser, causing it to scan
+     * the arguments again, (or to scan a new set of arguments); this
+     * may be achieved by the caller resetting `optind' to zero.
+     */
+    optmark = optind = argind = 0;
+    nextchar = NULL;
+  }
+
   if( nextchar && *nextchar )
   {
     /* we are parsing a standard, or short format, option argument ...
@@ -633,4 +646,4 @@ __weak_alias( getopt_long, _getopt_long )
 __weak_alias( getopt_long_only, _getopt_long_only )
 #endif
 
-/* $RCSfile$Revision$: end of file */
+/* $RCSfile$Revision: 1.1 $: end of file */