Changeset 3213 for trunk/src/kmk/kmkbuiltin/getopt1_r.c

Timestamp:

Mar 30, 2018, 11:03:28 PM (7 years ago)

Author:

bird

Message:

kmk: Forked getopt and created a reentrant variant getopt_r.

File:

• trunk/src/kmk/kmkbuiltin/getopt1_r.c (copied) (copied from trunk/src/kmk/getopt1.c ) (11 diffs)

trunk/src/kmk/kmkbuiltin/getopt1_r.c

@@ -1 @@
-/* getopt_long and getopt_long_only entry points for GNU getopt.
+/*  Reentrant version of getopt_long and getopt_long_only.
+
+Based on ../getopt*.*:
+
+   getopt_long and getopt_long_only entry points for GNU getopt.
 Copyright (C) 1987-1994, 1996-2016 Free Software Foundation, Inc.
 
@@ -15 +19 @@
 
 You should have received a copy of the GNU General Public License along with
-this program.  If not, see <http://www.gnu.org/licenses/>.  */
+this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Modifications:
+  Copyright (c) 2018 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
+*/
 
 
+#define FAKES_NO_GETOPT_H /* bird */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include "getopt.h"
+#include "getopt_r.h"
 
 #if !defined __STDC__ || !__STDC__
@@ -34 +43 @@
 #include <stdio.h>
 
+#if 0
 /* Comment out all this code if we are using the GNU C Library, and are not
    actually compiling the library itself.  This code is part of the GNU C
@@ -49 +59 @@
 #endif
 #endif
+#endif
 
-#ifndef ELIDE_CODE
+#if 1 //ndef ELIDE_CODE
 
 
@@ -64 +75 @@
 
 int
-getopt_long (int argc, char *const *argv, const char *options,
-             const struct option *long_options, int *opt_index)
+getopt_long_r (struct getopt_state_r *gos, int *opt_index)
 {
-  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
+  return _getopt_internal_r (gos, gos->long_options, opt_index, 0);
 }
 
@@ -76 +86 @@
 
 int
-getopt_long_only (int argc, char *const *argv, const char *options,
-                  const struct option *long_options, int *opt_index)
+getopt_long_only_r (struct getopt_state_r *gos, int *opt_index)
 {
-  return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
+  return _getopt_internal_r (gos, gos->long_options, opt_index, 0);
 }
 
 
-#endif  /* Not ELIDE_CODE.  */
+#endif /* #if 1 */ /* Not ELIDE_CODE.  */
 
 
@@ -100 +109 @@
       int this_option_optind = optind ? optind : 1;
       int option_index = 0;
+      struct getopt_state_r gos;
       static struct option long_options[] =
       {
@@ -111 +121 @@
       };
 
-      c = getopt_long (argc, argv, "abc:d:0123456789",
-                       long_options, &option_index);
+      getopt_initialize_r (&gos, argc, argv, "abc:d:0123456789", long_options, NULL, NULL);
+      c = getopt_long_r (&geo, &option_index);
       if (c == -1)
         break;
@@ -120 +130 @@
         case 0:
           printf ("option %s", long_options[option_index].name);
-          if (optarg)
-            printf (" with arg %s", optarg);
+          if (geo.optarg)
+            printf (" with arg %s", geo.optarg);
           printf ("\n");
           break;
@@ -150 +160 @@
 
         case 'c':
-          printf ("option c with value '%s'\n", optarg);
+          printf ("option c with value '%s'\n", geo.optarg);
           break;
 
         case 'd':
-          printf ("option d with value '%s'\n", optarg);
+          printf ("option d with value '%s'\n", geo.optarg);
           break;
 
@@ -165 +175 @@
     }
 
-  if (optind < argc)
+  if (geo.optind < argc)
     {
       printf ("non-option ARGV-elements: ");
       while (optind < argc)
-        printf ("%s ", argv[optind++]);
+        printf ("%s ", argv[geo.optind++]);
       printf ("\n");
     }