Index: /trunk/src/kmk/kmkbuiltin/getopt1_r.c =================================================================== --- /trunk/src/kmk/kmkbuiltin/getopt1_r.c (revision 3213) +++ /trunk/src/kmk/kmkbuiltin/getopt1_r.c (revision 3213) @@ -0,0 +1,188 @@ +/* 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. + +NOTE: The canonical source of this file is maintained with the GNU C Library. +Bugs can be reported to bug-glibc@gnu.org. + +GNU Make is free software; you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the Free Software +Foundation; either version 3 of the License, or (at your option) any later +version. + +GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program. If not, see . + +Modifications: + Copyright (c) 2018 knut st. osmundsen +*/ + + +#define FAKES_NO_GETOPT_H /* bird */ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "getopt_r.h" + +#if !defined __STDC__ || !__STDC__ +/* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +#ifndef const +#define const +#endif +#endif + +#include + +#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 + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#define GETOPT_INTERFACE_VERSION 2 +#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +#include +#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +#define ELIDE_CODE +#endif +#endif +#endif + +#if 1 //ndef ELIDE_CODE + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +#include +#endif + +#ifndef NULL +#define NULL 0 +#endif + +int +getopt_long_r (struct getopt_state_r *gos, int *opt_index) +{ + return _getopt_internal_r (gos, gos->long_options, opt_index, 0); +} + +/* Like getopt_long, but '-' as well as '--' can indicate a long option. + If an option that starts with '-' (not '--') doesn't match a long option, + but does match a short option, it is parsed as a short option + instead. */ + +int +getopt_long_only_r (struct getopt_state_r *gos, int *opt_index) +{ + return _getopt_internal_r (gos, gos->long_options, opt_index, 0); +} + + +#endif /* #if 1 */ /* Not ELIDE_CODE. */ + + +#ifdef TEST + +#include + +int +main (int argc, char **argv) +{ + int c; + int digit_optind = 0; + + while (1) + { + int this_option_optind = optind ? optind : 1; + int option_index = 0; + struct getopt_state_r gos; + static struct option long_options[] = + { + {"add", 1, 0, 0}, + {"append", 0, 0, 0}, + {"delete", 1, 0, 0}, + {"verbose", 0, 0, 0}, + {"create", 0, 0, 0}, + {"file", 1, 0, 0}, + {0, 0, 0, 0} + }; + + getopt_initialize_r (&gos, argc, argv, "abc:d:0123456789", long_options, NULL, NULL); + c = getopt_long_r (&geo, &option_index); + if (c == -1) + break; + + switch (c) + { + case 0: + printf ("option %s", long_options[option_index].name); + if (geo.optarg) + printf (" with arg %s", geo.optarg); + printf ("\n"); + break; + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value '%s'\n", geo.optarg); + break; + + case 'd': + printf ("option d with value '%s'\n", geo.optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } + } + + if (geo.optind < argc) + { + printf ("non-option ARGV-elements: "); + while (optind < argc) + printf ("%s ", argv[geo.optind++]); + printf ("\n"); + } + + exit (0); +} + +#endif /* TEST */ Index: /trunk/src/kmk/kmkbuiltin/getopt_r.c =================================================================== --- /trunk/src/kmk/kmkbuiltin/getopt_r.c (revision 3213) +++ /trunk/src/kmk/kmkbuiltin/getopt_r.c (revision 3213) @@ -0,0 +1,1093 @@ +/* Reentrant version of getopt. + +Based on ../getopt*.*: + + Getopt for GNU. +NOTE: getopt is now part of the C library, so if you don't know what +"Keep this file name-space clean" means, talk to drepper@gnu.org +before changing it! + +Copyright (C) 1987-2016 Free Software Foundation, Inc. + +NOTE: The canonical source of this file is maintained with the GNU C Library. +Bugs can be reported to bug-glibc@gnu.org. + +GNU Make is free software; you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the Free Software +Foundation; either version 3 of the License, or (at your option) any later +version. + +GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program. If not, see . + +Modifications: + Copyright (c) 2018 knut st. osmundsen +*/ + +/* This tells Alpha OSF/1 not to define a getopt prototype in . + Ditto for AIX 3.2 and . */ +#ifndef _NO_PROTO +# define _NO_PROTO +#endif + +#define FAKES_NO_GETOPT_H /* bird */ +#ifdef HAVE_CONFIG_H +# include +#endif + +#if !defined __STDC__ || !__STDC__ +/* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +# ifndef const +# define const +# endif +#endif + +#include + +#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 + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#define GETOPT_INTERFACE_VERSION 2 +#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +# include +# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +# define ELIDE_CODE +# endif +#endif +#endif + +#if 1 //ndef ELIDE_CODE + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +/* Don't include stdlib.h for non-GNU C libraries because some of them + contain conflicting prototypes for getopt. */ +# include +# include +#endif /* GNU C library. */ + +#ifdef VMS +# include +# if HAVE_STRING_H - 0 +# include +# endif +#endif + +/* This is for other GNU distributions with internationalized messages. + When compiling libc, the _ macro is predefined. */ +#include "gettext.h" +#define _(msgid) gettext (msgid) + + +/* This version of `getopt' appears to the caller like standard Unix 'getopt' + but it behaves differently for the user, since it allows the user + to intersperse the options with the other arguments. + + As `getopt' works, it permutes the elements of ARGV so that, + when it is done, all the options precede everything else. Thus + all application programs are extended to handle flexible argument order. + + Setting the environment variable POSIXLY_CORRECT disables permutation. + Then the behavior is completely standard. + + GNU application programs can use a third alternative mode in which + they can distinguish the relative order of options and other arguments. */ + +#include "getopt_r.h" +#include "err.h" +#include + +#if 0 /* Moved to state_getopt_r in getopt_r.h. */ +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +char *optarg = NULL; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +/* 1003.2 says this must be 1 before any call. */ +int optind = 1; + +/* Formerly, initialization of getopt depended on optind==0, which + causes problems with re-calling getopt as programs generally don't + know that. */ + +int __getopt_initialized = 0; + +/* 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; + +/* Callers store zero here to inhibit the error message + for unrecognized options. */ + +int opterr = 1; + +/* Set to an option character which was unrecognized. + This must be initialized on some systems to avoid linking in the + system's own getopt implementation. */ + +int optopt = '?'; +#endif /* Moved to state_getopt_r in getopt_r.h. */ + +/* Describe how to deal with options that follow non-option ARGV-elements. + + If the caller did not specify anything, + the default is REQUIRE_ORDER if the environment variable + POSIXLY_CORRECT is defined, PERMUTE otherwise. + + REQUIRE_ORDER means don't recognize them as options; + stop option processing when the first non-option is seen. + This is what Unix does. + This mode of operation is selected by either setting the environment + variable POSIXLY_CORRECT, or using `+' as the first character + of the list of option characters. + + PERMUTE is the default. We permute the contents of ARGV as we scan, + so that eventually all the non-options are at the end. This allows options + to be given in any order, even with programs that were not written to + expect this. + + RETURN_IN_ORDER is an option available to programs that were written + to expect options and other ARGV-elements in any order and that care about + the ordering of the two. We describe each non-option ARGV-element + as if it were the argument of an option with character code 1. + Using `-' as the first character of the list of option characters + selects this mode of operation. + + The special argument `--' forces an end of option-scanning regardless + of the value of `ordering'. In the case of RETURN_IN_ORDER, only + `--' can cause `getopt' to return -1 with `optind' != ARGC. */ + +/*static*/ enum +{ + REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER +} /*ordering*/; + +#if 0 /* Moved to state_getopt_r in getopt_r.h. */ +/* Value of POSIXLY_CORRECT environment variable. */ +static char *posixly_correct; +#endif + + + +#if 1 //def __GNU_LIBRARY__ +/* We want to avoid inclusion of string.h with non-GNU libraries + because there are many ways it can cause trouble. + On some systems, it contains special magic macros that don't work + in GCC. */ +# include +//# define my_index strchr +#else + +# if HAVE_STRING_H +# include +# else +# include +# endif + +#if 0 //def +/* Avoid depending on library functions or files + whose names are inconsistent. */ +#ifndef getenv +extern char *getenv (); +#endif +#endif + +static char * +my_index (const char *str, int chr) +{ + while (*str) + { + if (*str == chr) + return (char *) str; + str++; + } + return 0; +} + +/* If using GCC, we can safely declare strlen this way. + If not using GCC, it is ok not to declare it. */ +#ifdef __GNUC__ +/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h. + That was relevant to code that was here before. */ +# if (!defined __STDC__ || !__STDC__) && !defined strlen +/* gcc with -traditional declares the built-in strlen to return int, + and has done so at least since version 2.4.5. -- rms. */ +extern int strlen (const char *); +# endif /* not __STDC__ */ +#endif /* __GNUC__ */ + +#endif /* not __GNU_LIBRARY__ */ + + +/* Handle permutation of arguments. */ + +#if 0 /* Moved to state_getopt_r in getopt_r.h. */ +/* 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; +#endif + +#if 0 //def _LIBC +/* Bash 2.0 gives us an environment variable containing flags + indicating ARGV elements that should not be considered arguments. */ + +/* Defined in getopt_init.c */ +extern char *__getopt_nonoption_flags; + +static int nonoption_flags_max_len; +static int nonoption_flags_len; + +static int original_argc; +static char *const *original_argv; + +/* Make sure the environment variable bash 2.0 puts in the environment + is valid for the getopt call we must make sure that the ARGV passed + to getopt is that one passed to the process. */ +static void __attribute__ ((unused)) +store_args_and_env (int argc, char *const *argv) +{ + /* XXX This is no good solution. We should rather copy the args so + that we can compare them later. But we must not use malloc(3). */ + original_argc = argc; + original_argv = argv; +} +# ifdef text_set_element +text_set_element (__libc_subinit, store_args_and_env); +# endif /* text_set_element */ + +# define SWAP_FLAGS(ch1, ch2) \ + if (nonoption_flags_len > 0) \ + { \ + char __tmp = __getopt_nonoption_flags[ch1]; \ + __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ + __getopt_nonoption_flags[ch2] = __tmp; \ + } +#else /* !_LIBC */ +# define SWAP_FLAGS(ch1, ch2) do { } while (0) +#endif /* _LIBC */ + +/* Exchange two adjacent subsequences of ARGV. + One subsequence is elements [first_nonopt,last_nonopt) + which contains all the non-options that have been skipped so far. + The other is elements [last_nonopt,optind), which contains all + the options processed since those non-options were skipped. + + `first_nonopt' and `last_nonopt' are relocated so that they describe + the new indices of the non-options in ARGV after they are moved. */ + +static void +exchange (struct getopt_state_r *gos, char **argv) +{ + int bottom = gos->first_nonopt; + int middle = gos->last_nonopt; + int top = gos->optind; + char *tem; + + /* Exchange the shorter segment with the far end of the longer segment. + That puts the shorter segment into the right place. + It leaves the longer segment in the right place overall, + but it consists of two parts that need to be swapped next. */ + +#if 0 //def _LIBC + /* First make sure the handling of the `__getopt_nonoption_flags' + string can work normally. Our top argument must be in the range + of the string. */ + if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) + { + /* We must extend the array. The user plays games with us and + presents new arguments. */ + char *new_str = malloc (top + 1); + if (new_str == NULL) + nonoption_flags_len = nonoption_flags_max_len = 0; + else + { + memset (__mempcpy (new_str, __getopt_nonoption_flags, + nonoption_flags_max_len), + '\0', top + 1 - nonoption_flags_max_len); + nonoption_flags_max_len = top + 1; + __getopt_nonoption_flags = new_str; + } + } +#endif + + while (top > middle && middle > bottom) + { + if (top - middle > middle - bottom) + { + /* Bottom segment is the short one. */ + int len = middle - bottom; + register int i; + + /* Swap it with the top part of the top segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[top - (middle - bottom) + i]; + argv[top - (middle - bottom) + i] = tem; + SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); + } + /* Exclude the moved bottom segment from further swapping. */ + top -= len; + } + else + { + /* Top segment is the short one. */ + int len = top - middle; + register int i; + + /* Swap it with the bottom part of the bottom segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[middle + i]; + argv[middle + i] = tem; + SWAP_FLAGS (bottom + i, middle + i); + } + /* Exclude the moved top segment from further swapping. */ + bottom += len; + } + } + + /* Update records for the slots the non-options now occupy. */ + + gos->first_nonopt += (gos->optind - gos->last_nonopt); + gos->last_nonopt = gos->optind; +} + +/* Initialize the internal data */ + +void +getopt_initialize_r (struct getopt_state_r *gos, int argc, + char * const *argv, const char *shortopts, + const struct option *long_options, + char **envp, struct KMKBUILTINCTX *pCtx) +{ + assert (shortopts != NULL); + + /* General initialization. */ + gos->optarg = NULL; + gos->optind = 1; + gos->__getopt_initialized = (void *)(uintptr_t)&exchange; + gos->opterr = 1; + gos->optopt = '?'; + gos->argc = argc; + gos->argv = argv; + gos->optstring = shortopts; + gos->len_optstring = strlen (shortopts); + gos->long_options = long_options; + gos->pCtx = pCtx; + + /* Start processing options with ARGV-element 1 (since ARGV-element 0 + is the program name); the sequence of previously skipped + non-option ARGV-elements is empty. */ + + gos->first_nonopt = gos->last_nonopt = gos->optind; + + gos->nextchar = NULL; + + if (!envp) + gos->posixly_correct = getenv("POSIXLY_CORRECT"); + else + { + const char *psz; + size_t i = 0; + gos->posixly_correct = NULL; + while ((psz = envp[i]) != NULL) + { + if ( psz[0] == 'P' + && strncmp (psz, "POSIXLY_CORRECT=", sizeof("POSIXLY_CORRECT=") - 1) == 0) + { + gos->posixly_correct = psz + sizeof("POSIXLY_CORRECT=") - 1; + break; + } + i++; + } + } + + /* Determine how to handle the ordering of options and nonoptions. */ + + if (shortopts[0] == '-') + { + gos->ordering = RETURN_IN_ORDER; + gos->optstring++; + gos->len_optstring--; + } + else if (shortopts[0] == '+') + { + gos->ordering = REQUIRE_ORDER; + gos->optstring++; + gos->len_optstring--; + } + else if (gos->posixly_correct != NULL) + gos->ordering = REQUIRE_ORDER; + else + gos->ordering = PERMUTE; + +#if 0 //def _LIBC + if (posixly_correct == NULL + && argc == original_argc && argv == original_argv) + { + if (nonoption_flags_max_len == 0) + { + if (__getopt_nonoption_flags == NULL + || __getopt_nonoption_flags[0] == '\0') + nonoption_flags_max_len = -1; + else + { + const char *orig_str = __getopt_nonoption_flags; + int len = nonoption_flags_max_len = strlen (orig_str); + if (nonoption_flags_max_len < argc) + nonoption_flags_max_len = argc; + __getopt_nonoption_flags = + (char *) malloc (nonoption_flags_max_len); + if (__getopt_nonoption_flags == NULL) + nonoption_flags_max_len = -1; + else + memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), + '\0', nonoption_flags_max_len - len); + } + } + nonoption_flags_len = nonoption_flags_max_len; + } + else + nonoption_flags_len = 0; +#endif + + //return optstring; +} + + +/* Scan elements of ARGV (whose length is ARGC) for option characters + given in OPTSTRING. + + If an element of ARGV starts with '-', and is not exactly "-" or "--", + then it is an option element. The characters of this element + (aside from the initial '-') are option characters. If `getopt' + is called repeatedly, it returns successively each of the option characters + from each of the option elements. + + If `getopt' finds another option character, it returns that character, + updating `optind' and `nextchar' so that the next call to `getopt' can + resume the scan with the following option character or ARGV-element. + + If there are no more option characters, `getopt' returns -1. + Then `optind' is the index in ARGV of the first ARGV-element + that is not an option. (The ARGV-elements have been permuted + so that those that are not options now come last.) + + OPTSTRING is a string containing the legitimate option characters. + If an option character is seen that is not listed in OPTSTRING, + return '?' after printing an error message. If you set `opterr' to + zero, the error message is suppressed but we still return '?'. + + If a char in OPTSTRING is followed by a colon, that means it wants an arg, + so the following text in the same ARGV-element, or the text of the following + ARGV-element, is returned in `optarg'. Two colons mean an option that + wants an optional arg; if there is text in the current ARGV-element, + it is returned in `optarg', otherwise `optarg' is set to zero. + + If OPTSTRING starts with `-' or `+', it requests different methods of + handling the non-option ARGV-elements. + See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. + + Long-named options begin with `--' instead of `-'. + Their names may be abbreviated as long as the abbreviation is unique + or is an exact match for some defined option. If they have an + argument, it follows the option name in the same ARGV-element, separated + from the option name by a `=', or else the in next ARGV-element. + When `getopt' finds a long-named option, it returns 0 if that option's + `flag' field is nonzero, the value of the option's `val' field + if the `flag' field is zero. + + The elements of ARGV aren't really const, because we permute them. + But we pretend they're const in the prototype to be compatible + with other systems. + + LONGOPTS is a vector of `struct option' terminated by an + element containing a name which is zero. + + LONGIND returns the index in LONGOPT of the long-named option found. + It is only valid when a long-named option has been found by the most + recent call. + + If LONG_ONLY is nonzero, '-' as well as '--' can introduce + long-named options. */ + +int +_getopt_internal_r (struct getopt_state_r *gos, const struct option *longopts, + int *longind, int long_only) +{ + assert (gos->__getopt_initialized == (void *)(uintptr_t)&exchange); + gos->optarg = NULL; + +#if 0 /* requires explicit call now */ + if (gos->optind == 0 || !gos->__getopt_initialized) + { + if (gos->optind == 0) + gos->optind = 1; /* Don't scan ARGV[0], the program name. */ + optstring = _getopt_initialize_r (gos, gos->argc, gos->argv, optstring); + gos->__getopt_initialized = 1; + } +#else + assert (gos->__getopt_initialized == (void *)(uintptr_t)&exchange); +#endif + + /* Test whether ARGV[optind] points to a non-option argument. + Either it does not have option syntax, or there is an environment flag + from the shell indicating it is not an option. The later information + is only used when the used in the GNU libc. */ +#if 0 //def _LIBC +# define NONOPTION_P (gos->argv[gos->optind][0] != '-' || gos->argv[gos->optind][1] == '\0' \ + || (gos->optind < gos->nonoption_flags_len \ + && gos->__getopt_nonoption_flags[gos->optind] == '1')) +#else +# define NONOPTION_P (gos->argv[gos->optind][0] != '-' || gos->argv[gos->optind][1] == '\0') +#endif + + if (gos->nextchar == NULL || *gos->nextchar == '\0') + { + /* Advance to the next ARGV-element. */ + + /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been + moved back by the user (who may also have changed the arguments). */ + if (gos->last_nonopt > gos->optind) + gos->last_nonopt = gos->optind; + if (gos->first_nonopt > gos->optind) + gos->first_nonopt = gos->optind; + + if (gos->ordering == PERMUTE) + { + /* If we have just processed some options following some non-options, + exchange them so that the options come first. */ + + if (gos->first_nonopt != gos->last_nonopt && gos->last_nonopt != gos->optind) + exchange (gos, (char **) gos->argv); + else if (gos->last_nonopt != gos->optind) + gos->first_nonopt = gos->optind; + + /* Skip any additional non-options + and extend the range of non-options previously skipped. */ + + while (gos->optind < gos->argc && NONOPTION_P) + gos->optind++; + gos->last_nonopt = gos->optind; + } + + /* The special ARGV-element `--' means premature end of options. + Skip it like a null option, + then exchange with previous non-options as if it were an option, + then skip everything else like a non-option. */ + + if (gos->optind != gos->argc && !strcmp (gos->argv[gos->optind], "--")) + { + gos->optind++; + + if (gos->first_nonopt != gos->last_nonopt && gos->last_nonopt != gos->optind) + exchange (gos, (char **) gos->argv); + else if (gos->first_nonopt == gos->last_nonopt) + gos->first_nonopt = gos->optind; + gos->last_nonopt = gos->argc; + + gos->optind = gos->argc; + } + + /* If we have done all the ARGV-elements, stop the scan + and back over any non-options that we skipped and permuted. */ + + if (gos->optind == gos->argc) + { + /* Set the next-arg-index to point at the non-options + that we previously skipped, so the caller will digest them. */ + if (gos->first_nonopt != gos->last_nonopt) + gos->optind = gos->first_nonopt; + return -1; + } + + /* If we have come to a non-option and did not permute it, + either stop the scan or describe it to the caller and pass it by. */ + + if (NONOPTION_P) + { + if (gos->ordering == REQUIRE_ORDER) + return -1; + gos->optarg = gos->argv[gos->optind++]; + return 1; + } + + /* We have found another option-ARGV-element. + Skip the initial punctuation. */ + + gos->nextchar = (gos->argv[gos->optind] + 1 + + (longopts != NULL && gos->argv[gos->optind][1] == '-')); + } + + /* Decode the current option-ARGV-element. */ + + /* Check whether the ARGV-element is a long option. + + If long_only and the ARGV-element has the form "-f", where f is + a valid short option, don't consider it an abbreviated form of + a long option that starts with f. Otherwise there would be no + way to give the -f short option. + + On the other hand, if there's a long option "fubar" and + the ARGV-element is "-fu", do consider that an abbreviation of + the long option, just like "--fu", and not "-f" with arg "u". + + This distinction seems to be the most useful approach. */ + + if (longopts != NULL + && (gos->argv[gos->optind][1] == '-' + || (long_only + && ( gos->argv[gos->optind][2] + || !memchr (gos->optstring, gos->argv[gos->optind][1], gos->len_optstring) ) + ) + ) + ) + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = -1; + int option_index; + + for (nameend = gos->nextchar; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, gos->nextchar, nameend - gos->nextchar)) + { + if ((unsigned int) (nameend - gos->nextchar) + == (unsigned int) strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + + if (ambig && !exact) + { + if (gos->opterr) + errx (gos->pCtx, 2, _("%s: option '%s' is ambiguous"), + gos->argv[0], gos->argv[gos->optind]); + gos->nextchar += strlen (gos->nextchar); + gos->optind++; + gos->optopt = 0; + return '?'; + } + + if (pfound != NULL) + { + option_index = indfound; + gos->optind++; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + gos->optarg = nameend + 1; + else + { + if (gos->opterr) + { /* bird: disambiguate */ + if (gos->argv[gos->optind - 1][1] == '-') + /* --option */ + errx (gos->pCtx, 2, + _("%s: option '--%s' doesn't allow an argument\n"), + gos->argv[0], pfound->name); + else + /* +option or -option */ + errx (gos->pCtx, 2, + _("%s: option '%c%s' doesn't allow an argument\n"), + gos->argv[0], gos->argv[gos->optind - 1][0], pfound->name); + } + + gos->nextchar += strlen (gos->nextchar); + + gos->optopt = pfound->val; + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (gos->optind < gos->argc) + gos->optarg = gos->argv[gos->optind++]; + else + { + if (gos->opterr) + errx (gos->pCtx, 2, + _("%s: option '%s' requires an argument\n"), + gos->argv[0], gos->argv[gos->optind - 1]); + gos->nextchar += strlen (gos->nextchar); + gos->optopt = pfound->val; + return gos->optstring[0] == ':' ? ':' : '?'; + } + } + gos->nextchar += strlen (gos->nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + + /* Can't find it as a long option. If this is not getopt_long_only, + or the option starts with '--' or is not a valid short + option, then it's an error. + Otherwise interpret it as a short option. */ + if (!long_only || gos->argv[gos->optind][1] == '-' + || memchr(gos->optstring, *gos->nextchar, gos->len_optstring) == NULL) + { + if (gos->opterr) + { + if (gos->argv[gos->optind][1] == '-') + /* --option */ + errx (gos->pCtx, 2, _("%s: unrecognized option '--%s'\n"), + gos->argv[0], gos->nextchar); + else + /* +option or -option */ + errx (gos->pCtx, 2, _("%s: unrecognized option '%c%s'\n"), + gos->argv[0], gos->argv[gos->optind][0], gos->nextchar); + } + gos->nextchar = (char *) ""; + gos->optind++; + gos->optopt = 0; + return '?'; + } + } + + /* Look at and handle the next short option-character. */ + + { + char c = *gos->nextchar++; + char *temp = (char *)memchr (gos->optstring, c, gos->len_optstring); + + /* Increment `optind' when we start to process its last character. */ + if (*gos->nextchar == '\0') + ++gos->optind; + + if (temp == NULL || c == ':') + { + if (gos->opterr) + { + if (gos->posixly_correct) + /* 1003.2 specifies the format of this message. */ + errx (gos->pCtx, 2, _("%s: illegal option -- %c\n"), + gos->argv[0], c); + else + errx (gos->pCtx, 2, _("%s: invalid option -- %c\n"), + gos->argv[0], c); + } + gos->optopt = c; + return '?'; + } + /* Convenience. Treat POSIX -W foo same as long option --foo */ + if (temp[0] == 'W' && temp[1] == ';') + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = 0; + int option_index; + + /* This is an option that requires an argument. */ + if (*gos->nextchar != '\0') + { + gos->optarg = gos->nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + gos->optind++; + } + else if (gos->optind == gos->argc) + { + if (gos->opterr) + { + /* 1003.2 specifies the format of this message. */ + errx (gos->pCtx, 2, _("%s: option requires an argument -- %c\n"), + gos->argv[0], c); + } + gos->optopt = c; + if (gos->optstring[0] == ':') + c = ':'; + else + c = '?'; + return c; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + gos->optarg = gos->argv[gos->optind++]; + + /* optarg is now the argument, see if it's in the + table of longopts. */ + + for (gos->nextchar = nameend = gos->optarg; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, gos->nextchar, nameend - gos->nextchar)) + { + if ((unsigned int) (nameend - gos->nextchar) == strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + if (ambig && !exact) + { + if (gos->opterr) + errx (gos->pCtx, 2, _("%s: option '-W %s' is ambiguous\n"), + gos->argv[0], gos->argv[gos->optind]); + gos->nextchar += strlen (gos->nextchar); + gos->optind++; + return '?'; + } + if (pfound != NULL) + { + option_index = indfound; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + gos->optarg = nameend + 1; + else + { + if (gos->opterr) + errx (gos->pCtx, 2, + _("%s: option '-W %s' doesn't allow an argument\n"), + gos->argv[0], pfound->name); + + gos->nextchar += strlen (gos->nextchar); + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (gos->optind < gos->argc) + gos->optarg = gos->argv[gos->optind++]; + else + { + if (gos->opterr) + errx (gos->pCtx, 2, + _("%s: option '%s' requires an argument\n"), + gos->argv[0], gos->argv[gos->optind - 1]); + gos->nextchar += strlen (gos->nextchar); + return gos->optstring[0] == ':' ? ':' : '?'; + } + } + gos->nextchar += strlen (gos->nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + gos->nextchar = NULL; + return 'W'; /* Let the application handle it. */ + } + if (temp[1] == ':') + { + if (temp[2] == ':') + { + /* This is an option that accepts an argument optionally. */ + if (*gos->nextchar != '\0') + { + gos->optarg = gos->nextchar; + gos->optind++; + } + else + gos->optarg = NULL; + gos->nextchar = NULL; + } + else + { + /* This is an option that requires an argument. */ + if (*gos->nextchar != '\0') + { + gos->optarg = gos->nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + gos->optind++; + } + else if (gos->optind == gos->argc) + { + if (gos->opterr) + { + /* 1003.2 specifies the format of this message. */ + errx (gos->pCtx, 2, + _("%s: option requires an argument -- %c\n"), + gos->argv[0], c); + } + gos->optopt = c; + if (gos->optstring[0] == ':') + c = ':'; + else + c = '?'; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + gos->optarg = gos->argv[gos->optind++]; + gos->nextchar = NULL; + } + } + return c; + } +} + +int +getopt_r (struct getopt_state_r *gos) +{ + return _getopt_internal_r (gos, NULL, NULL, 0); +} + +#endif /* #if 1 */ /* Not ELIDE_CODE. */ + + +#ifdef TEST + +/* Compile with -DTEST to make an executable for use in testing + the above definition of `getopt'. */ + +int +main (int argc, char **argv) +{ + int c; + int digit_optind = 0; + struct getopt_state_r = gos; + + getopt_initialize_r (&gos, argc, argv, "abc:d:0123456789", NULL, NULL, NULL); + + while (1) + { + int this_option_optind = gos.optind ? gos.optind : 1; + + c = getopt_r (&gos); + if (c == -1) + break; + + switch (c) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value '%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } + } + + if (gos.optind < argc) + { + printf ("non-option ARGV-elements: "); + while (gos.optind < argc) + printf ("%s ", argv[gos.optind++]); + printf ("\n"); + } + + exit (0); +} + +#endif /* TEST */ Index: /trunk/src/kmk/kmkbuiltin/getopt_r.h =================================================================== --- /trunk/src/kmk/kmkbuiltin/getopt_r.h (revision 3213) +++ /trunk/src/kmk/kmkbuiltin/getopt_r.h (revision 3213) @@ -0,0 +1,180 @@ +/* Reentrant version of getopt. + +Based on ../getopt*.*: + + Declarations for getopt. +Copyright (C) 1989-2016 Free Software Foundation, Inc. + +NOTE: The canonical source of this file is maintained with the GNU C Library. +Bugs can be reported to bug-glibc@gnu.org. + +GNU Make is free software; you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the Free Software +Foundation; either version 3 of the License, or (at your option) any later +version. + +GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program. If not, see . + +Modifications: + Copyright (c) 2018 knut st. osmundsen +*/ + +/* 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. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +/*extern*/ char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +/*extern*/ int optind; + +/* Callers store zero here to inhibit the error message `getopt' prints + for unrecognized options. */ + +/*extern*/ int opterr; + +/* Set to an option character which was unrecognized. */ + +/*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. + The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector + of `struct option' terminated by an element containing a name which is + zero. + + The field `has_arg' is: + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. + + If the field `flag' is not NULL, it points to a variable that is set + to the value given in the field `val' when the option is found, but + left unchanged if the option is not found. + + To have a long-named option do something other than set an `int' to + a compiled-in constant, such as set a value from `optarg', set the + option's `flag' field to zero and its `val' field to a nonzero + value (the equivalent single-letter option character, if there is + one). For long options that have a zero `flag' field, `getopt' + returns the contents of the `val' field. */ + +struct option +{ +#if defined (__STDC__) && __STDC__ + const char *name; +#else + char *name; +#endif + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* Names for the values of the `has_arg' field of `struct option'. */ + +#define no_argument 0 +#define required_argument 1 +#define optional_argument 2 + +#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_r (struct getopt_state_r *gos, + const struct option *longopts, + int *longind, int long_only); + +#ifdef __cplusplus +} +#endif + +#endif /* getopt_r.h */ Index: /trunk/src/kmk/kmkbuiltin/mscfakes.h =================================================================== --- /trunk/src/kmk/kmkbuiltin/mscfakes.h (revision 3212) +++ /trunk/src/kmk/kmkbuiltin/mscfakes.h (revision 3213) @@ -38,5 +38,7 @@ #include #include -#include "getopt.h" +#ifndef FAKES_NO_GETOPT_H +# include "getopt.h" +#endif #ifndef MSCFAKES_NO_WINDOWS_H # include Index: /trunk/src/kmk/kmkbuiltin/solfakes.h =================================================================== --- /trunk/src/kmk/kmkbuiltin/solfakes.h (revision 3212) +++ /trunk/src/kmk/kmkbuiltin/solfakes.h (revision 3213) @@ -30,5 +30,8 @@ #include #include -#include "getopt.h" +#ifndef FAKES_NO_GETOPT_H +# include "getopt.h" +#endif + #define _PATH_DEVNULL "/dev/null" #define ALLPERMS 0000777 @@ -45,4 +48,4 @@ #endif /* __sun__ */ -#endif /* ___solfakes_h */ +#endif /* !___solfakes_h */