Changeset 3213 for trunk/src/kmk/kmkbuiltin/getopt_r.h

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/getopt_r.h (copied) (copied from trunk/src/kmk/getopt.h ) (6 diffs)

trunk/src/kmk/kmkbuiltin/getopt_r.h

@@ -1 @@
-/* Declarations for getopt.
+/* Reentrant version of getopt.
+
+Based on ../getopt*.*:
+
+   Declarations for getopt.
 Copyright (C) 1989-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/>.
 
-#ifndef _GETOPT_H
-#define _GETOPT_H 1
+Modifications:
+  Copyright (c) 2018 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
+*/
+
+/* Not quite safe to mix when converting code. */
+#ifdef _GETOPT_H
+# define _GETOPT_H "getopt.h was included already"
+# error "getopt.h was included already"
+#endif
+
+#ifndef INCLUDED_GETOPT_R_H
+#define INCLUDED_GETOPT_R_H 1
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
+
+typedef struct getopt_state_r
+{
 
 /* For communication from `getopt' to the caller.
@@ -30 +47 @@
    each non-option ARGV-element is returned here.  */
 
-extern char *optarg;
+/*extern*/ char *optarg;
 
 /* Index in ARGV of the next element to be scanned.
@@ -44 +61 @@
    how much of ARGV has been scanned so far.  */
 
-extern int optind;
+/*extern*/ int optind;
 
 /* Callers store zero here to inhibit the error message `getopt' prints
    for unrecognized options.  */
 
-extern int opterr;
+/*extern*/ int opterr;
 
 /* Set to an option character which was unrecognized.  */
 
-extern int optopt;
+/*extern*/ int optopt;
+
+
+/* Internal state: */
+
+/* The next char to be scanned in the option-element
+   in which the last option character we returned was found.
+   This allows us to pick up the scan where we left off.
+
+   If this is zero, or a null string, it means resume the scan
+   by advancing to the next ARGV-element.  */
+
+/*static*/ char *nextchar;
+
+/* REQUIRE_ORDER, PERMUTE or RETURN_IN_ORDER, see getopt_r.c. */
+/*static*/ int ordering;
+
+/* Value of POSIXLY_CORRECT environment variable.  */
+/*static*/ char *posixly_correct;
+
+/* Describe the part of ARGV that contains non-options that have
+   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
+   `last_nonopt' is the index after the last of them.  */
+
+/*static*/ int first_nonopt;
+/*static*/ int last_nonopt;
+
+/* Mainly for asserting usage sanity. */
+/*static*/ void *__getopt_initialized;
+
+/* New internal state (to resubmitting same parameters in each call): */
+  /* new: the argument vector length. */
+  int argc;
+  /* new: the argument vector. */
+  char * const *argv;
+  /* new: the short option string (can be NULL/empty). */
+  const char *optstring;
+  /* new: the short option string length. */
+  size_t len_optstring;
+  /* new: the long options (can be NULL) */
+  const struct option *long_options;
+  /* Output context for err.h. */
+  struct KMKBUILTINCTX *pCtx;
+} getopt_state_r;
+
+
+#ifndef no_argument
 
 /* Describe the long-named options requested by the application.
@@ -96 +159 @@
 #define optional_argument       2
 
-#if defined (__STDC__) && __STDC__
-#ifdef __GNU_LIBRARY__
-/* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in stdlib.h.  To avoid compilation
-   errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-#endif /* __GNU_LIBRARY__ */
-extern int getopt_long (int argc, char *const *argv, const char *shortopts,
-                        const struct option *longopts, int *longind);
-extern int getopt_long_only (int argc, char *const *argv,
-                             const char *shortopts,
-                             const struct option *longopts, int *longind);
+#endif /* Same as ../getopt.h.  Fix later? */
+
+extern void getopt_initialize_r (struct getopt_state_r *gos, int argc,
+                                 char *const *argv, const char *shortopts,
+                                 const struct option *longopts,
+                                 char **envp, struct KMKBUILTINCTX *pCtx);
+extern int getopt_r (struct getopt_state_r *gos);
+extern int getopt_long_r (struct getopt_state_r *gos, int *longind);
+extern int getopt_long_only_r (struct getopt_state_r *gos, int *longind);
 
 /* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int argc, char *const *argv,
-                             const char *shortopts,
-                             const struct option *longopts, int *longind,
-                             int long_only);
-#else /* not __STDC__ */
-extern int getopt ();
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-#endif /* __STDC__ */
+extern int _getopt_internal_r (struct getopt_state_r *gos,
+                               const struct option *longopts,
+                               int *longind, int long_only);
 
 #ifdef  __cplusplus
@@ -128 +178 @@
 #endif
 
-#endif /* getopt.h */
+#endif /* getopt_r.h */