diff --git a/appveyor.yml b/appveyor.yml
index 8967e719..59063ec7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -93,8 +93,7 @@ build_script:
- bash -c "exec 0
+#
+# This program 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 2 of the License, or (at your
+# option) any later version.
+#
+# This program 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 .
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Archive. When you make and distribute a
+# modified version of the Autoconf Macro, you may extend this special
+# exception to the GPL to apply to your modified version as well.
+
+#serial 6
+
+AU_ALIAS([ADL_FUNC_GETOPT_LONG], [AX_FUNC_GETOPT_LONG])
+AC_DEFUN([AX_FUNC_GETOPT_LONG],
+ [AC_PREREQ(2.49)dnl
+ # clean out junk possibly left behind by a previous configuration
+ rm -f src/getopt.h
+ # Check for getopt_long support
+ AC_CHECK_HEADERS([getopt.h])
+ AC_CHECK_FUNCS([getopt_long],,
+ [# FreeBSD has a gnugetopt library for this
+ AC_CHECK_LIB([gnugetopt],[getopt_long],[AC_DEFINE([HAVE_GETOPT_LONG])],
+ [# use the OpenSC replacement
+ AC_CONFIG_LINKS([src/getopt.h:src/common/compat_getopt.h])])])])
diff --git a/src/Makefile.mak b/src/Makefile.mak
index c3779216..8dee6196 100644
--- a/src/Makefile.mak
+++ b/src/Makefile.mak
@@ -19,6 +19,12 @@ SUBDIRS = $(SUBDIRS) smm
SUBDIRS = $(SUBDIRS) tests
!ENDIF
-all clean::
+all::
+ copy /y common\compat_getopt.h getopt.h
@for %i in ( $(SUBDIRS) ) do \
@cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@"
+
+clean::
+ @for %i in ( $(SUBDIRS) ) do \
+ @cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@"
+ del /Q getopt.h
diff --git a/src/common/compat_getopt.h b/src/common/compat_getopt.h
index 8ff5401a..b1f36337 100644
--- a/src/common/compat_getopt.h
+++ b/src/common/compat_getopt.h
@@ -30,10 +30,6 @@
#include "config.h"
#endif
-#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG) && defined(HAVE_GETOPT_LONG_ONLY)
-#include
-#else
-
/* Prevent mingw32 from including an incompatible getopt implementation */
#define __GETOPT_H__
@@ -86,6 +82,4 @@ extern int _my_getopt_internal(int argc, char * argv[], const char *shortopts,
}
#endif
-#endif /* HAVE_GETOPT_H && HAVE_GETOPT_LONG && HAVE_GETOPT_LONG_ONLY */
-
#endif /* MY_GETOPT_H_INCLUDED */
diff --git a/src/tests/sc-test.c b/src/tests/sc-test.c
index 42bc1f6f..35b42965 100644
--- a/src/tests/sc-test.c
+++ b/src/tests/sc-test.c
@@ -10,7 +10,7 @@
#include
#include
-#include "common/compat_getopt.h"
+#include
#include "libopensc/opensc.h"
#include "sc-test.h"
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 217c1a0a..b0ad08d9 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -104,7 +104,7 @@ npa-tool.c: $(abs_builddir)/npa-tool.ggo $(NPA_TOOL_BUILT_SOURCES)
# We only want *cmdline* to be generated when they have explicitly been removed.
$(NPA_TOOL_BUILT_SOURCES):
$(MAKE) $(abs_builddir)/npa-tool.ggo
- $(GENGETOPT) --include-getopt --file-name=npa-tool-cmdline --output-dir=$(builddir) < $(abs_builddir)/npa-tool.ggo
+ $(GENGETOPT) --file-name=npa-tool-cmdline --output-dir=$(builddir) < $(abs_builddir)/npa-tool.ggo
$(abs_builddir)/npa-tool.ggo: npa-tool.ggo.in
$(do_subst) < $(abs_srcdir)/npa-tool.ggo.in > $@
@@ -122,7 +122,7 @@ opensc-notify.c: $(abs_builddir)/opensc-notify.ggo $(OPENSC_NOTIFY_BUILT_SOURCES
# We only want *cmdline* to be generated when they have explicitly been removed.
$(OPENSC_NOTIFY_BUILT_SOURCES):
$(MAKE) $(abs_builddir)/opensc-notify.ggo
- $(GENGETOPT) --include-getopt --file-name=opensc-notify-cmdline --output-dir=$(builddir) < $(abs_builddir)/opensc-notify.ggo
+ $(GENGETOPT) --file-name=opensc-notify-cmdline --output-dir=$(builddir) < $(abs_builddir)/opensc-notify.ggo
$(abs_builddir)/opensc-notify.ggo: opensc-notify.ggo.in
$(do_subst) < $(abs_srcdir)/opensc-notify.ggo.in > $@
@@ -140,7 +140,7 @@ egk-tool.c: $(abs_builddir)/egk-tool.ggo $(EGK_TOOL_BUILT_SOURCES)
# We only want *cmdline* to be generated when they have explicitly been removed.
$(EGK_TOOL_BUILT_SOURCES):
$(MAKE) $(abs_builddir)/egk-tool.ggo
- $(GENGETOPT) --include-getopt --file-name=egk-tool-cmdline --output-dir=$(builddir) < $(abs_builddir)/egk-tool.ggo
+ $(GENGETOPT) --file-name=egk-tool-cmdline --output-dir=$(builddir) < $(abs_builddir)/egk-tool.ggo
$(abs_builddir)/egk-tool.ggo: egk-tool.ggo.in
$(do_subst) < $(abs_srcdir)/egk-tool.ggo.in > $@
@@ -158,7 +158,7 @@ goid-tool.c: $(abs_builddir)/goid-tool.ggo $(GOID_TOOL_BUILT_SOURCES)
# We only want *cmdline* to be generated when they have explicitly been removed.
$(GOID_TOOL_BUILT_SOURCES):
$(MAKE) $(abs_builddir)/goid-tool.ggo
- $(GENGETOPT) --include-getopt --file-name=goid-tool-cmdline --output-dir=$(builddir) < $(abs_builddir)/goid-tool.ggo
+ $(GENGETOPT) --file-name=goid-tool-cmdline --output-dir=$(builddir) < $(abs_builddir)/goid-tool.ggo
$(abs_builddir)/goid-tool.ggo: goid-tool.ggo.in
$(do_subst) < $(abs_srcdir)/goid-tool.ggo.in > $@
@@ -173,7 +173,7 @@ opensc-asn1.c: $(abs_builddir)/opensc-asn1.ggo $(OPENSC_ASN1_BUILT_SOURCES)
# We only want *cmdline* to be generated when they have explicitly been removed.
$(OPENSC_ASN1_BUILT_SOURCES):
$(MAKE) $(abs_builddir)/opensc-asn1.ggo
- $(GENGETOPT) --include-getopt --file-name=opensc-asn1-cmdline --output-dir=$(builddir) < $(abs_builddir)/opensc-asn1.ggo --unamed-opts
+ $(GENGETOPT) --file-name=opensc-asn1-cmdline --output-dir=$(builddir) < $(abs_builddir)/opensc-asn1.ggo --unamed-opts
$(abs_builddir)/opensc-asn1.ggo: opensc-asn1.ggo.in
$(do_subst) < $(abs_srcdir)/opensc-asn1.ggo.in > $@
diff --git a/src/tools/egk-tool-cmdline.c b/src/tools/egk-tool-cmdline.c
index 39f991e7..22851b0e 100644
--- a/src/tools/egk-tool-cmdline.c
+++ b/src/tools/egk-tool-cmdline.c
@@ -1,7 +1,7 @@
/*
File autogenerated by gengetopt version 2.22.6
generated with the following command:
- /usr/bin/gengetopt --include-getopt --file-name=egk-tool-cmdline --output-dir=.
+ /usr/bin/gengetopt --file-name=egk-tool-cmdline --output-dir=.
The developers of gengetopt consider the fixed text that goes in all
gengetopt output files to be in the public domain:
@@ -21,6 +21,7 @@
#define FIX_UNUSED(X) (void) (X) /* avoid warnings for unused params */
#endif
+#include
#include "egk-tool-cmdline.h"
@@ -425,598 +426,6 @@ cmdline_parser_required2 (struct gengetopt_args_info *args_info, const char *pro
return error_occurred;
}
-/*
- * Extracted from the glibc source tree, version 2.3.6
- *
- * Licensed under the GPL as per the whole glibc source tree.
- *
- * This file was modified so that getopt_long can be called
- * many times without risking previous memory to be spoiled.
- *
- * Modified by Andre Noll and Lorenzo Bettini for use in
- * GNU gengetopt generated files.
- *
- */
-
-/*
- * we must include anything we need since this file is not thought to be
- * inserted in a file already using getopt.h
- *
- * Lorenzo
- */
-
-struct option
-{
- const char *name;
- /* 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;
-};
-
-/* 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.
-*/
-/*
- 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 `custom_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. */
-
-/* Names for the values of the `has_arg' field of `struct option'. */
-#ifndef no_argument
-#define no_argument 0
-#endif
-
-#ifndef required_argument
-#define required_argument 1
-#endif
-
-#ifndef optional_argument
-#define optional_argument 2
-#endif
-
-struct custom_getopt_data {
- /*
- * These have exactly the same meaning as the corresponding global variables,
- * except that they are used for the reentrant versions of getopt.
- */
- int custom_optind;
- int custom_opterr;
- int custom_optopt;
- char *custom_optarg;
-
- /* True if the internal members have been initialized. */
- int initialized;
-
- /*
- * 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.
- */
- char *nextchar;
-
- /*
- * 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.
- */
- int first_nonopt;
- int last_nonopt;
-};
-
-/*
- * the variables optarg, optind, opterr and optopt are renamed with
- * the custom_ prefix so that they don't interfere with getopt ones.
- *
- * Moreover they're static so they are visible only from within the
- * file where this very file will be included.
- */
-
-/*
- * For communication from `custom_getopt' to the caller. When `custom_getopt' finds an
- * option that takes an argument, the argument value is returned here.
- */
-static char *custom_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 `custom_getopt'.
- *
- * On entry to `custom_getopt', 1 means this is the first call; initialize.
- *
- * When `custom_getopt' returns -1, this is the index of the first of the non-option
- * elements that the caller should itself scan.
- *
- * Otherwise, `custom_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.
- */
-static int custom_optind = 1;
-
-/*
- * Callers store zero here to inhibit the error message for unrecognized
- * options.
- */
-static int custom_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.
- */
-static int custom_optopt = '?';
-
-/*
- * 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,custom_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(char **argv, struct custom_getopt_data *d)
-{
- int bottom = d->first_nonopt;
- int middle = d->last_nonopt;
- int top = d->custom_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.
- */
- while (top > middle && middle > bottom) {
- if (top - middle > middle - bottom) {
- /* Bottom segment is the short one. */
- int len = middle - bottom;
- 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;
- }
- /* Exclude the moved bottom segment from further swapping. */
- top -= len;
- } else {
- /* Top segment is the short one. */
- int len = top - middle;
- 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;
- }
- /* Exclude the moved top segment from further swapping. */
- bottom += len;
- }
- }
- /* Update records for the slots the non-options now occupy. */
- d->first_nonopt += (d->custom_optind - d->last_nonopt);
- d->last_nonopt = d->custom_optind;
-}
-
-/* Initialize the internal data when the first call is made. */
-static void custom_getopt_initialize(struct custom_getopt_data *d)
-{
- /*
- * 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.
- */
- d->first_nonopt = d->last_nonopt = d->custom_optind;
- d->nextchar = NULL;
- d->initialized = 1;
-}
-
-#define NONOPTION_P (argv[d->custom_optind][0] != '-' || argv[d->custom_optind][1] == '\0')
-
-/* return: zero: continue, nonzero: return given value to user */
-static int shuffle_argv(int argc, char *const *argv,const struct option *longopts,
- struct custom_getopt_data *d)
-{
- /*
- * Give FIRST_NONOPT & LAST_NONOPT rational values if CUSTOM_OPTIND has been
- * moved back by the user (who may also have changed the arguments).
- */
- if (d->last_nonopt > d->custom_optind)
- d->last_nonopt = d->custom_optind;
- if (d->first_nonopt > d->custom_optind)
- d->first_nonopt = d->custom_optind;
- /*
- * If we have just processed some options following some
- * non-options, exchange them so that the options come first.
- */
- if (d->first_nonopt != d->last_nonopt &&
- d->last_nonopt != d->custom_optind)
- exchange((char **) argv, d);
- else if (d->last_nonopt != d->custom_optind)
- d->first_nonopt = d->custom_optind;
- /*
- * Skip any additional non-options and extend the range of
- * non-options previously skipped.
- */
- while (d->custom_optind < argc && NONOPTION_P)
- d->custom_optind++;
- d->last_nonopt = d->custom_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 (d->custom_optind != argc && !strcmp(argv[d->custom_optind], "--")) {
- d->custom_optind++;
- if (d->first_nonopt != d->last_nonopt
- && d->last_nonopt != d->custom_optind)
- exchange((char **) argv, d);
- else if (d->first_nonopt == d->last_nonopt)
- d->first_nonopt = d->custom_optind;
- d->last_nonopt = argc;
- d->custom_optind = argc;
- }
- /*
- * If we have done all the ARGV-elements, stop the scan and back over
- * any non-options that we skipped and permuted.
- */
- if (d->custom_optind == argc) {
- /*
- * Set the next-arg-index to point at the non-options that we
- * previously skipped, so the caller will digest them.
- */
- if (d->first_nonopt != d->last_nonopt)
- d->custom_optind = d->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) {
- d->custom_optarg = argv[d->custom_optind++];
- return 1;
- }
- /*
- * We have found another option-ARGV-element. Skip the initial
- * punctuation.
- */
- d->nextchar = (argv[d->custom_optind] + 1 + (longopts != NULL && argv[d->custom_optind][1] == '-'));
- return 0;
-}
-
-/*
- * Check whether the ARGV-element is a long option.
- *
- * If there's a long option "fubar" and the ARGV-element is "-fu", 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.
- *
- */
-static int check_long_opt(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind,
- int print_errors, struct custom_getopt_data *d)
-{
- 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 = d->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, d->nextchar, nameend - d->nextchar)) {
- if ((unsigned int) (nameend - d->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 if (pfound->has_arg != p->has_arg
- || pfound->flag != p->flag
- || pfound->val != p->val)
- /* Second or later nonexact match found. */
- ambig = 1;
- }
- if (ambig && !exact) {
- if (print_errors) {
- fprintf(stderr,
- "%s: option `%s' is ambiguous\n",
- argv[0], argv[d->custom_optind]);
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optind++;
- d->custom_optopt = 0;
- return '?';
- }
- if (pfound) {
- option_index = indfound;
- d->custom_optind++;
- if (*nameend) {
- if (pfound->has_arg != no_argument)
- d->custom_optarg = nameend + 1;
- else {
- if (print_errors) {
- if (argv[d->custom_optind - 1][1] == '-') {
- /* --option */
- fprintf(stderr, "%s: option `--%s' doesn't allow an argument\n",
- argv[0], pfound->name);
- } else {
- /* +option or -option */
- fprintf(stderr, "%s: option `%c%s' doesn't allow an argument\n",
- argv[0], argv[d->custom_optind - 1][0], pfound->name);
- }
-
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optopt = pfound->val;
- return '?';
- }
- } else if (pfound->has_arg == required_argument) {
- if (d->custom_optind < argc)
- d->custom_optarg = argv[d->custom_optind++];
- else {
- if (print_errors) {
- fprintf(stderr,
- "%s: option `%s' requires an argument\n",
- argv[0],
- argv[d->custom_optind - 1]);
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optopt = pfound->val;
- return optstring[0] == ':' ? ':' : '?';
- }
- }
- d->nextchar += strlen(d->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 (print_errors) {
- if (argv[d->custom_optind][1] == '-') {
- /* --option */
- fprintf(stderr,
- "%s: unrecognized option `--%s'\n",
- argv[0], d->nextchar);
- } else {
- /* +option or -option */
- fprintf(stderr,
- "%s: unrecognized option `%c%s'\n",
- argv[0], argv[d->custom_optind][0],
- d->nextchar);
- }
- }
- d->nextchar = (char *) "";
- d->custom_optind++;
- d->custom_optopt = 0;
- return '?';
-}
-
-static int check_short_opt(int argc, char *const *argv, const char *optstring,
- int print_errors, struct custom_getopt_data *d)
-{
- char c = *d->nextchar++;
- const char *temp = strchr(optstring, c);
-
- /* Increment `custom_optind' when we start to process its last character. */
- if (*d->nextchar == '\0')
- ++d->custom_optind;
- if (!temp || c == ':') {
- if (print_errors)
- fprintf(stderr, "%s: invalid option -- %c\n", argv[0], c);
-
- d->custom_optopt = c;
- return '?';
- }
- if (temp[1] == ':') {
- if (temp[2] == ':') {
- /* This is an option that accepts an argument optionally. */
- if (*d->nextchar != '\0') {
- d->custom_optarg = d->nextchar;
- d->custom_optind++;
- } else
- d->custom_optarg = NULL;
- d->nextchar = NULL;
- } else {
- /* This is an option that requires an argument. */
- if (*d->nextchar != '\0') {
- d->custom_optarg = d->nextchar;
- /*
- * If we end this ARGV-element by taking the
- * rest as an arg, we must advance to the next
- * element now.
- */
- d->custom_optind++;
- } else if (d->custom_optind == argc) {
- if (print_errors) {
- fprintf(stderr,
- "%s: option requires an argument -- %c\n",
- argv[0], c);
- }
- d->custom_optopt = c;
- if (optstring[0] == ':')
- c = ':';
- else
- c = '?';
- } else
- /*
- * We already incremented `custom_optind' once;
- * increment it again when taking next ARGV-elt
- * as argument.
- */
- d->custom_optarg = argv[d->custom_optind++];
- d->nextchar = NULL;
- }
- }
- return c;
-}
-
-/*
- * Scan elements of ARGV 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 `custom_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 `custom_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 `custom_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 `custom_optarg'. Two colons mean an option that
- * wants an optional arg; if there is text in the current ARGV-element,
- * it is returned in `custom_optarg', otherwise `custom_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.
- *
- * Return the option character from OPTS just read. Return -1 when there are
- * no more options. For unrecognized options, or options missing arguments,
- * `custom_optopt' is set to the option letter, and '?' is returned.
- *
- * The OPTS string is a list of characters which are recognized option letters,
- * optionally followed by colons, specifying that that letter takes an
- * argument, to be placed in `custom_optarg'.
- *
- * If a letter in OPTS is followed by two colons, its argument is optional.
- * This behavior is specific to the GNU `getopt'.
- *
- * The argument `--' causes premature termination of argument scanning,
- * explicitly telling `getopt' that there are no more options. If OPTS begins
- * with `--', then non-option arguments are treated as arguments to the option
- * '\0'. This behavior is specific to the GNU `getopt'.
- */
-
-static int getopt_internal_r(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind,
- struct custom_getopt_data *d)
-{
- int ret, print_errors = d->custom_opterr;
-
- if (optstring[0] == ':')
- print_errors = 0;
- if (argc < 1)
- return -1;
- d->custom_optarg = NULL;
-
- /*
- * This is a big difference with GNU getopt, since optind == 0
- * means initialization while here 1 means first call.
- */
- if (d->custom_optind == 0 || !d->initialized) {
- if (d->custom_optind == 0)
- d->custom_optind = 1; /* Don't scan ARGV[0], the program name. */
- custom_getopt_initialize(d);
- }
- if (d->nextchar == NULL || *d->nextchar == '\0') {
- ret = shuffle_argv(argc, argv, longopts, d);
- if (ret)
- return ret;
- }
- if (longopts && (argv[d->custom_optind][1] == '-' ))
- return check_long_opt(argc, argv, optstring, longopts,
- longind, print_errors, d);
- return check_short_opt(argc, argv, optstring, print_errors, d);
-}
-
-static int custom_getopt_internal(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind)
-{
- int result;
- /* Keep a global copy of all internal members of d */
- static struct custom_getopt_data d;
-
- d.custom_optind = custom_optind;
- d.custom_opterr = custom_opterr;
- result = getopt_internal_r(argc, argv, optstring, longopts,
- longind, &d);
- custom_optind = d.custom_optind;
- custom_optarg = d.custom_optarg;
- custom_optopt = d.custom_optopt;
- return result;
-}
-
-static int custom_getopt_long (int argc, char *const *argv, const char *options,
- const struct option *long_options, int *opt_index)
-{
- return custom_getopt_internal(argc, argv, options, long_options,
- opt_index);
-}
-
static char *package_name = 0;
@@ -1134,11 +543,6 @@ cmdline_parser_internal (
int initialize;
int check_required;
int check_ambiguity;
-
- char *optarg;
- int optind;
- int opterr;
- int optopt;
package_name = argv[0];
@@ -1173,17 +577,7 @@ cmdline_parser_internal (
{ 0, 0, 0, 0 }
};
- custom_optarg = optarg;
- custom_optind = optind;
- custom_opterr = opterr;
- custom_optopt = optopt;
-
- c = custom_getopt_long (argc, argv, "hVr:v", long_options, &option_index);
-
- optarg = custom_optarg;
- optind = custom_optind;
- opterr = custom_opterr;
- optopt = custom_optopt;
+ c = getopt_long (argc, argv, "hVr:v", long_options, &option_index);
if (c == -1) break; /* Exit from `while (1)' loop. */
diff --git a/src/tools/eidenv.c b/src/tools/eidenv.c
index d96ad4e7..9c0c48b6 100644
--- a/src/tools/eidenv.c
+++ b/src/tools/eidenv.c
@@ -29,7 +29,7 @@
#include
#include
-#include "common/compat_getopt.h"
+#include
#include "libopensc/opensc.h"
#include "libopensc/asn1.h"
#include "libopensc/cards.h"
diff --git a/src/tools/goid-tool-cmdline.c b/src/tools/goid-tool-cmdline.c
index c191234d..6e020347 100644
--- a/src/tools/goid-tool-cmdline.c
+++ b/src/tools/goid-tool-cmdline.c
@@ -1,7 +1,7 @@
/*
File autogenerated by gengetopt version 2.22.6
generated with the following command:
- /usr/bin/gengetopt --include-getopt --file-name=goid-tool-cmdline --output-dir=.
+ /usr/bin/gengetopt --file-name=goid-tool-cmdline --output-dir=.
The developers of gengetopt consider the fixed text that goes in all
gengetopt output files to be in the public domain:
@@ -21,6 +21,7 @@
#define FIX_UNUSED(X) (void) (X) /* avoid warnings for unused params */
#endif
+#include
#include "goid-tool-cmdline.h"
@@ -837,598 +838,6 @@ cmdline_parser_required2 (struct gengetopt_args_info *args_info, const char *pro
return error_occurred;
}
-/*
- * Extracted from the glibc source tree, version 2.3.6
- *
- * Licensed under the GPL as per the whole glibc source tree.
- *
- * This file was modified so that getopt_long can be called
- * many times without risking previous memory to be spoiled.
- *
- * Modified by Andre Noll and Lorenzo Bettini for use in
- * GNU gengetopt generated files.
- *
- */
-
-/*
- * we must include anything we need since this file is not thought to be
- * inserted in a file already using getopt.h
- *
- * Lorenzo
- */
-
-struct option
-{
- const char *name;
- /* 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;
-};
-
-/* 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.
-*/
-/*
- 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 `custom_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. */
-
-/* Names for the values of the `has_arg' field of `struct option'. */
-#ifndef no_argument
-#define no_argument 0
-#endif
-
-#ifndef required_argument
-#define required_argument 1
-#endif
-
-#ifndef optional_argument
-#define optional_argument 2
-#endif
-
-struct custom_getopt_data {
- /*
- * These have exactly the same meaning as the corresponding global variables,
- * except that they are used for the reentrant versions of getopt.
- */
- int custom_optind;
- int custom_opterr;
- int custom_optopt;
- char *custom_optarg;
-
- /* True if the internal members have been initialized. */
- int initialized;
-
- /*
- * 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.
- */
- char *nextchar;
-
- /*
- * 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.
- */
- int first_nonopt;
- int last_nonopt;
-};
-
-/*
- * the variables optarg, optind, opterr and optopt are renamed with
- * the custom_ prefix so that they don't interfere with getopt ones.
- *
- * Moreover they're static so they are visible only from within the
- * file where this very file will be included.
- */
-
-/*
- * For communication from `custom_getopt' to the caller. When `custom_getopt' finds an
- * option that takes an argument, the argument value is returned here.
- */
-static char *custom_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 `custom_getopt'.
- *
- * On entry to `custom_getopt', 1 means this is the first call; initialize.
- *
- * When `custom_getopt' returns -1, this is the index of the first of the non-option
- * elements that the caller should itself scan.
- *
- * Otherwise, `custom_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.
- */
-static int custom_optind = 1;
-
-/*
- * Callers store zero here to inhibit the error message for unrecognized
- * options.
- */
-static int custom_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.
- */
-static int custom_optopt = '?';
-
-/*
- * 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,custom_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(char **argv, struct custom_getopt_data *d)
-{
- int bottom = d->first_nonopt;
- int middle = d->last_nonopt;
- int top = d->custom_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.
- */
- while (top > middle && middle > bottom) {
- if (top - middle > middle - bottom) {
- /* Bottom segment is the short one. */
- int len = middle - bottom;
- 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;
- }
- /* Exclude the moved bottom segment from further swapping. */
- top -= len;
- } else {
- /* Top segment is the short one. */
- int len = top - middle;
- 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;
- }
- /* Exclude the moved top segment from further swapping. */
- bottom += len;
- }
- }
- /* Update records for the slots the non-options now occupy. */
- d->first_nonopt += (d->custom_optind - d->last_nonopt);
- d->last_nonopt = d->custom_optind;
-}
-
-/* Initialize the internal data when the first call is made. */
-static void custom_getopt_initialize(struct custom_getopt_data *d)
-{
- /*
- * 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.
- */
- d->first_nonopt = d->last_nonopt = d->custom_optind;
- d->nextchar = NULL;
- d->initialized = 1;
-}
-
-#define NONOPTION_P (argv[d->custom_optind][0] != '-' || argv[d->custom_optind][1] == '\0')
-
-/* return: zero: continue, nonzero: return given value to user */
-static int shuffle_argv(int argc, char *const *argv,const struct option *longopts,
- struct custom_getopt_data *d)
-{
- /*
- * Give FIRST_NONOPT & LAST_NONOPT rational values if CUSTOM_OPTIND has been
- * moved back by the user (who may also have changed the arguments).
- */
- if (d->last_nonopt > d->custom_optind)
- d->last_nonopt = d->custom_optind;
- if (d->first_nonopt > d->custom_optind)
- d->first_nonopt = d->custom_optind;
- /*
- * If we have just processed some options following some
- * non-options, exchange them so that the options come first.
- */
- if (d->first_nonopt != d->last_nonopt &&
- d->last_nonopt != d->custom_optind)
- exchange((char **) argv, d);
- else if (d->last_nonopt != d->custom_optind)
- d->first_nonopt = d->custom_optind;
- /*
- * Skip any additional non-options and extend the range of
- * non-options previously skipped.
- */
- while (d->custom_optind < argc && NONOPTION_P)
- d->custom_optind++;
- d->last_nonopt = d->custom_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 (d->custom_optind != argc && !strcmp(argv[d->custom_optind], "--")) {
- d->custom_optind++;
- if (d->first_nonopt != d->last_nonopt
- && d->last_nonopt != d->custom_optind)
- exchange((char **) argv, d);
- else if (d->first_nonopt == d->last_nonopt)
- d->first_nonopt = d->custom_optind;
- d->last_nonopt = argc;
- d->custom_optind = argc;
- }
- /*
- * If we have done all the ARGV-elements, stop the scan and back over
- * any non-options that we skipped and permuted.
- */
- if (d->custom_optind == argc) {
- /*
- * Set the next-arg-index to point at the non-options that we
- * previously skipped, so the caller will digest them.
- */
- if (d->first_nonopt != d->last_nonopt)
- d->custom_optind = d->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) {
- d->custom_optarg = argv[d->custom_optind++];
- return 1;
- }
- /*
- * We have found another option-ARGV-element. Skip the initial
- * punctuation.
- */
- d->nextchar = (argv[d->custom_optind] + 1 + (longopts != NULL && argv[d->custom_optind][1] == '-'));
- return 0;
-}
-
-/*
- * Check whether the ARGV-element is a long option.
- *
- * If there's a long option "fubar" and the ARGV-element is "-fu", 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.
- *
- */
-static int check_long_opt(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind,
- int print_errors, struct custom_getopt_data *d)
-{
- 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 = d->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, d->nextchar, nameend - d->nextchar)) {
- if ((unsigned int) (nameend - d->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 if (pfound->has_arg != p->has_arg
- || pfound->flag != p->flag
- || pfound->val != p->val)
- /* Second or later nonexact match found. */
- ambig = 1;
- }
- if (ambig && !exact) {
- if (print_errors) {
- fprintf(stderr,
- "%s: option `%s' is ambiguous\n",
- argv[0], argv[d->custom_optind]);
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optind++;
- d->custom_optopt = 0;
- return '?';
- }
- if (pfound) {
- option_index = indfound;
- d->custom_optind++;
- if (*nameend) {
- if (pfound->has_arg != no_argument)
- d->custom_optarg = nameend + 1;
- else {
- if (print_errors) {
- if (argv[d->custom_optind - 1][1] == '-') {
- /* --option */
- fprintf(stderr, "%s: option `--%s' doesn't allow an argument\n",
- argv[0], pfound->name);
- } else {
- /* +option or -option */
- fprintf(stderr, "%s: option `%c%s' doesn't allow an argument\n",
- argv[0], argv[d->custom_optind - 1][0], pfound->name);
- }
-
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optopt = pfound->val;
- return '?';
- }
- } else if (pfound->has_arg == required_argument) {
- if (d->custom_optind < argc)
- d->custom_optarg = argv[d->custom_optind++];
- else {
- if (print_errors) {
- fprintf(stderr,
- "%s: option `%s' requires an argument\n",
- argv[0],
- argv[d->custom_optind - 1]);
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optopt = pfound->val;
- return optstring[0] == ':' ? ':' : '?';
- }
- }
- d->nextchar += strlen(d->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 (print_errors) {
- if (argv[d->custom_optind][1] == '-') {
- /* --option */
- fprintf(stderr,
- "%s: unrecognized option `--%s'\n",
- argv[0], d->nextchar);
- } else {
- /* +option or -option */
- fprintf(stderr,
- "%s: unrecognized option `%c%s'\n",
- argv[0], argv[d->custom_optind][0],
- d->nextchar);
- }
- }
- d->nextchar = (char *) "";
- d->custom_optind++;
- d->custom_optopt = 0;
- return '?';
-}
-
-static int check_short_opt(int argc, char *const *argv, const char *optstring,
- int print_errors, struct custom_getopt_data *d)
-{
- char c = *d->nextchar++;
- const char *temp = strchr(optstring, c);
-
- /* Increment `custom_optind' when we start to process its last character. */
- if (*d->nextchar == '\0')
- ++d->custom_optind;
- if (!temp || c == ':') {
- if (print_errors)
- fprintf(stderr, "%s: invalid option -- %c\n", argv[0], c);
-
- d->custom_optopt = c;
- return '?';
- }
- if (temp[1] == ':') {
- if (temp[2] == ':') {
- /* This is an option that accepts an argument optionally. */
- if (*d->nextchar != '\0') {
- d->custom_optarg = d->nextchar;
- d->custom_optind++;
- } else
- d->custom_optarg = NULL;
- d->nextchar = NULL;
- } else {
- /* This is an option that requires an argument. */
- if (*d->nextchar != '\0') {
- d->custom_optarg = d->nextchar;
- /*
- * If we end this ARGV-element by taking the
- * rest as an arg, we must advance to the next
- * element now.
- */
- d->custom_optind++;
- } else if (d->custom_optind == argc) {
- if (print_errors) {
- fprintf(stderr,
- "%s: option requires an argument -- %c\n",
- argv[0], c);
- }
- d->custom_optopt = c;
- if (optstring[0] == ':')
- c = ':';
- else
- c = '?';
- } else
- /*
- * We already incremented `custom_optind' once;
- * increment it again when taking next ARGV-elt
- * as argument.
- */
- d->custom_optarg = argv[d->custom_optind++];
- d->nextchar = NULL;
- }
- }
- return c;
-}
-
-/*
- * Scan elements of ARGV 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 `custom_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 `custom_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 `custom_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 `custom_optarg'. Two colons mean an option that
- * wants an optional arg; if there is text in the current ARGV-element,
- * it is returned in `custom_optarg', otherwise `custom_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.
- *
- * Return the option character from OPTS just read. Return -1 when there are
- * no more options. For unrecognized options, or options missing arguments,
- * `custom_optopt' is set to the option letter, and '?' is returned.
- *
- * The OPTS string is a list of characters which are recognized option letters,
- * optionally followed by colons, specifying that that letter takes an
- * argument, to be placed in `custom_optarg'.
- *
- * If a letter in OPTS is followed by two colons, its argument is optional.
- * This behavior is specific to the GNU `getopt'.
- *
- * The argument `--' causes premature termination of argument scanning,
- * explicitly telling `getopt' that there are no more options. If OPTS begins
- * with `--', then non-option arguments are treated as arguments to the option
- * '\0'. This behavior is specific to the GNU `getopt'.
- */
-
-static int getopt_internal_r(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind,
- struct custom_getopt_data *d)
-{
- int ret, print_errors = d->custom_opterr;
-
- if (optstring[0] == ':')
- print_errors = 0;
- if (argc < 1)
- return -1;
- d->custom_optarg = NULL;
-
- /*
- * This is a big difference with GNU getopt, since optind == 0
- * means initialization while here 1 means first call.
- */
- if (d->custom_optind == 0 || !d->initialized) {
- if (d->custom_optind == 0)
- d->custom_optind = 1; /* Don't scan ARGV[0], the program name. */
- custom_getopt_initialize(d);
- }
- if (d->nextchar == NULL || *d->nextchar == '\0') {
- ret = shuffle_argv(argc, argv, longopts, d);
- if (ret)
- return ret;
- }
- if (longopts && (argv[d->custom_optind][1] == '-' ))
- return check_long_opt(argc, argv, optstring, longopts,
- longind, print_errors, d);
- return check_short_opt(argc, argv, optstring, print_errors, d);
-}
-
-static int custom_getopt_internal(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind)
-{
- int result;
- /* Keep a global copy of all internal members of d */
- static struct custom_getopt_data d;
-
- d.custom_optind = custom_optind;
- d.custom_opterr = custom_opterr;
- result = getopt_internal_r(argc, argv, optstring, longopts,
- longind, &d);
- custom_optind = d.custom_optind;
- custom_optarg = d.custom_optarg;
- custom_optopt = d.custom_optopt;
- return result;
-}
-
-static int custom_getopt_long (int argc, char *const *argv, const char *options,
- const struct option *long_options, int *opt_index)
-{
- return custom_getopt_internal(argc, argv, options, long_options,
- opt_index);
-}
-
static char *package_name = 0;
@@ -1730,11 +1139,6 @@ cmdline_parser_internal (
int initialize;
int check_required;
int check_ambiguity;
-
- char *optarg;
- int optind;
- int opterr;
- int optopt;
package_name = argv[0];
@@ -1788,17 +1192,7 @@ cmdline_parser_internal (
{ 0, 0, 0, 0 }
};
- custom_optarg = optarg;
- custom_optind = optind;
- custom_opterr = opterr;
- custom_optopt = optopt;
-
- c = custom_getopt_long (argc, argv, "hVr:vpbc:k:", long_options, &option_index);
-
- optarg = custom_optarg;
- optind = custom_optind;
- opterr = custom_opterr;
- optopt = custom_optopt;
+ c = getopt_long (argc, argv, "hVr:vpbc:k:", long_options, &option_index);
if (c == -1) break; /* Exit from `while (1)' loop. */
diff --git a/src/tools/netkey-tool.c b/src/tools/netkey-tool.c
index 4249187b..2456f677 100644
--- a/src/tools/netkey-tool.c
+++ b/src/tools/netkey-tool.c
@@ -27,7 +27,7 @@
#include
#include
-#include "common/compat_getopt.h"
+#include
#include "libopensc/opensc.h"
static struct {
diff --git a/src/tools/npa-tool-cmdline.c b/src/tools/npa-tool-cmdline.c
index 1b88a20c..2918888a 100644
--- a/src/tools/npa-tool-cmdline.c
+++ b/src/tools/npa-tool-cmdline.c
@@ -1,7 +1,7 @@
/*
File autogenerated by gengetopt version 2.22.6
generated with the following command:
- /usr/bin/gengetopt --include-getopt --file-name=npa-tool-cmdline --output-dir=.
+ /usr/bin/gengetopt --file-name=npa-tool-cmdline --output-dir=.
The developers of gengetopt consider the fixed text that goes in all
gengetopt output files to be in the public domain:
@@ -21,6 +21,7 @@
#define FIX_UNUSED(X) (void) (X) /* avoid warnings for unused params */
#endif
+#include
#include "npa-tool-cmdline.h"
@@ -896,598 +897,6 @@ cmdline_parser_required2 (struct gengetopt_args_info *args_info, const char *pro
return error_occurred;
}
-/*
- * Extracted from the glibc source tree, version 2.3.6
- *
- * Licensed under the GPL as per the whole glibc source tree.
- *
- * This file was modified so that getopt_long can be called
- * many times without risking previous memory to be spoiled.
- *
- * Modified by Andre Noll and Lorenzo Bettini for use in
- * GNU gengetopt generated files.
- *
- */
-
-/*
- * we must include anything we need since this file is not thought to be
- * inserted in a file already using getopt.h
- *
- * Lorenzo
- */
-
-struct option
-{
- const char *name;
- /* 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;
-};
-
-/* 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.
-*/
-/*
- 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 `custom_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. */
-
-/* Names for the values of the `has_arg' field of `struct option'. */
-#ifndef no_argument
-#define no_argument 0
-#endif
-
-#ifndef required_argument
-#define required_argument 1
-#endif
-
-#ifndef optional_argument
-#define optional_argument 2
-#endif
-
-struct custom_getopt_data {
- /*
- * These have exactly the same meaning as the corresponding global variables,
- * except that they are used for the reentrant versions of getopt.
- */
- int custom_optind;
- int custom_opterr;
- int custom_optopt;
- char *custom_optarg;
-
- /* True if the internal members have been initialized. */
- int initialized;
-
- /*
- * 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.
- */
- char *nextchar;
-
- /*
- * 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.
- */
- int first_nonopt;
- int last_nonopt;
-};
-
-/*
- * the variables optarg, optind, opterr and optopt are renamed with
- * the custom_ prefix so that they don't interfere with getopt ones.
- *
- * Moreover they're static so they are visible only from within the
- * file where this very file will be included.
- */
-
-/*
- * For communication from `custom_getopt' to the caller. When `custom_getopt' finds an
- * option that takes an argument, the argument value is returned here.
- */
-static char *custom_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 `custom_getopt'.
- *
- * On entry to `custom_getopt', 1 means this is the first call; initialize.
- *
- * When `custom_getopt' returns -1, this is the index of the first of the non-option
- * elements that the caller should itself scan.
- *
- * Otherwise, `custom_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.
- */
-static int custom_optind = 1;
-
-/*
- * Callers store zero here to inhibit the error message for unrecognized
- * options.
- */
-static int custom_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.
- */
-static int custom_optopt = '?';
-
-/*
- * 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,custom_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(char **argv, struct custom_getopt_data *d)
-{
- int bottom = d->first_nonopt;
- int middle = d->last_nonopt;
- int top = d->custom_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.
- */
- while (top > middle && middle > bottom) {
- if (top - middle > middle - bottom) {
- /* Bottom segment is the short one. */
- int len = middle - bottom;
- 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;
- }
- /* Exclude the moved bottom segment from further swapping. */
- top -= len;
- } else {
- /* Top segment is the short one. */
- int len = top - middle;
- 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;
- }
- /* Exclude the moved top segment from further swapping. */
- bottom += len;
- }
- }
- /* Update records for the slots the non-options now occupy. */
- d->first_nonopt += (d->custom_optind - d->last_nonopt);
- d->last_nonopt = d->custom_optind;
-}
-
-/* Initialize the internal data when the first call is made. */
-static void custom_getopt_initialize(struct custom_getopt_data *d)
-{
- /*
- * 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.
- */
- d->first_nonopt = d->last_nonopt = d->custom_optind;
- d->nextchar = NULL;
- d->initialized = 1;
-}
-
-#define NONOPTION_P (argv[d->custom_optind][0] != '-' || argv[d->custom_optind][1] == '\0')
-
-/* return: zero: continue, nonzero: return given value to user */
-static int shuffle_argv(int argc, char *const *argv,const struct option *longopts,
- struct custom_getopt_data *d)
-{
- /*
- * Give FIRST_NONOPT & LAST_NONOPT rational values if CUSTOM_OPTIND has been
- * moved back by the user (who may also have changed the arguments).
- */
- if (d->last_nonopt > d->custom_optind)
- d->last_nonopt = d->custom_optind;
- if (d->first_nonopt > d->custom_optind)
- d->first_nonopt = d->custom_optind;
- /*
- * If we have just processed some options following some
- * non-options, exchange them so that the options come first.
- */
- if (d->first_nonopt != d->last_nonopt &&
- d->last_nonopt != d->custom_optind)
- exchange((char **) argv, d);
- else if (d->last_nonopt != d->custom_optind)
- d->first_nonopt = d->custom_optind;
- /*
- * Skip any additional non-options and extend the range of
- * non-options previously skipped.
- */
- while (d->custom_optind < argc && NONOPTION_P)
- d->custom_optind++;
- d->last_nonopt = d->custom_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 (d->custom_optind != argc && !strcmp(argv[d->custom_optind], "--")) {
- d->custom_optind++;
- if (d->first_nonopt != d->last_nonopt
- && d->last_nonopt != d->custom_optind)
- exchange((char **) argv, d);
- else if (d->first_nonopt == d->last_nonopt)
- d->first_nonopt = d->custom_optind;
- d->last_nonopt = argc;
- d->custom_optind = argc;
- }
- /*
- * If we have done all the ARGV-elements, stop the scan and back over
- * any non-options that we skipped and permuted.
- */
- if (d->custom_optind == argc) {
- /*
- * Set the next-arg-index to point at the non-options that we
- * previously skipped, so the caller will digest them.
- */
- if (d->first_nonopt != d->last_nonopt)
- d->custom_optind = d->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) {
- d->custom_optarg = argv[d->custom_optind++];
- return 1;
- }
- /*
- * We have found another option-ARGV-element. Skip the initial
- * punctuation.
- */
- d->nextchar = (argv[d->custom_optind] + 1 + (longopts != NULL && argv[d->custom_optind][1] == '-'));
- return 0;
-}
-
-/*
- * Check whether the ARGV-element is a long option.
- *
- * If there's a long option "fubar" and the ARGV-element is "-fu", 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.
- *
- */
-static int check_long_opt(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind,
- int print_errors, struct custom_getopt_data *d)
-{
- 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 = d->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, d->nextchar, nameend - d->nextchar)) {
- if ((unsigned int) (nameend - d->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 if (pfound->has_arg != p->has_arg
- || pfound->flag != p->flag
- || pfound->val != p->val)
- /* Second or later nonexact match found. */
- ambig = 1;
- }
- if (ambig && !exact) {
- if (print_errors) {
- fprintf(stderr,
- "%s: option `%s' is ambiguous\n",
- argv[0], argv[d->custom_optind]);
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optind++;
- d->custom_optopt = 0;
- return '?';
- }
- if (pfound) {
- option_index = indfound;
- d->custom_optind++;
- if (*nameend) {
- if (pfound->has_arg != no_argument)
- d->custom_optarg = nameend + 1;
- else {
- if (print_errors) {
- if (argv[d->custom_optind - 1][1] == '-') {
- /* --option */
- fprintf(stderr, "%s: option `--%s' doesn't allow an argument\n",
- argv[0], pfound->name);
- } else {
- /* +option or -option */
- fprintf(stderr, "%s: option `%c%s' doesn't allow an argument\n",
- argv[0], argv[d->custom_optind - 1][0], pfound->name);
- }
-
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optopt = pfound->val;
- return '?';
- }
- } else if (pfound->has_arg == required_argument) {
- if (d->custom_optind < argc)
- d->custom_optarg = argv[d->custom_optind++];
- else {
- if (print_errors) {
- fprintf(stderr,
- "%s: option `%s' requires an argument\n",
- argv[0],
- argv[d->custom_optind - 1]);
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optopt = pfound->val;
- return optstring[0] == ':' ? ':' : '?';
- }
- }
- d->nextchar += strlen(d->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 (print_errors) {
- if (argv[d->custom_optind][1] == '-') {
- /* --option */
- fprintf(stderr,
- "%s: unrecognized option `--%s'\n",
- argv[0], d->nextchar);
- } else {
- /* +option or -option */
- fprintf(stderr,
- "%s: unrecognized option `%c%s'\n",
- argv[0], argv[d->custom_optind][0],
- d->nextchar);
- }
- }
- d->nextchar = (char *) "";
- d->custom_optind++;
- d->custom_optopt = 0;
- return '?';
-}
-
-static int check_short_opt(int argc, char *const *argv, const char *optstring,
- int print_errors, struct custom_getopt_data *d)
-{
- char c = *d->nextchar++;
- const char *temp = strchr(optstring, c);
-
- /* Increment `custom_optind' when we start to process its last character. */
- if (*d->nextchar == '\0')
- ++d->custom_optind;
- if (!temp || c == ':') {
- if (print_errors)
- fprintf(stderr, "%s: invalid option -- %c\n", argv[0], c);
-
- d->custom_optopt = c;
- return '?';
- }
- if (temp[1] == ':') {
- if (temp[2] == ':') {
- /* This is an option that accepts an argument optionally. */
- if (*d->nextchar != '\0') {
- d->custom_optarg = d->nextchar;
- d->custom_optind++;
- } else
- d->custom_optarg = NULL;
- d->nextchar = NULL;
- } else {
- /* This is an option that requires an argument. */
- if (*d->nextchar != '\0') {
- d->custom_optarg = d->nextchar;
- /*
- * If we end this ARGV-element by taking the
- * rest as an arg, we must advance to the next
- * element now.
- */
- d->custom_optind++;
- } else if (d->custom_optind == argc) {
- if (print_errors) {
- fprintf(stderr,
- "%s: option requires an argument -- %c\n",
- argv[0], c);
- }
- d->custom_optopt = c;
- if (optstring[0] == ':')
- c = ':';
- else
- c = '?';
- } else
- /*
- * We already incremented `custom_optind' once;
- * increment it again when taking next ARGV-elt
- * as argument.
- */
- d->custom_optarg = argv[d->custom_optind++];
- d->nextchar = NULL;
- }
- }
- return c;
-}
-
-/*
- * Scan elements of ARGV 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 `custom_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 `custom_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 `custom_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 `custom_optarg'. Two colons mean an option that
- * wants an optional arg; if there is text in the current ARGV-element,
- * it is returned in `custom_optarg', otherwise `custom_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.
- *
- * Return the option character from OPTS just read. Return -1 when there are
- * no more options. For unrecognized options, or options missing arguments,
- * `custom_optopt' is set to the option letter, and '?' is returned.
- *
- * The OPTS string is a list of characters which are recognized option letters,
- * optionally followed by colons, specifying that that letter takes an
- * argument, to be placed in `custom_optarg'.
- *
- * If a letter in OPTS is followed by two colons, its argument is optional.
- * This behavior is specific to the GNU `getopt'.
- *
- * The argument `--' causes premature termination of argument scanning,
- * explicitly telling `getopt' that there are no more options. If OPTS begins
- * with `--', then non-option arguments are treated as arguments to the option
- * '\0'. This behavior is specific to the GNU `getopt'.
- */
-
-static int getopt_internal_r(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind,
- struct custom_getopt_data *d)
-{
- int ret, print_errors = d->custom_opterr;
-
- if (optstring[0] == ':')
- print_errors = 0;
- if (argc < 1)
- return -1;
- d->custom_optarg = NULL;
-
- /*
- * This is a big difference with GNU getopt, since optind == 0
- * means initialization while here 1 means first call.
- */
- if (d->custom_optind == 0 || !d->initialized) {
- if (d->custom_optind == 0)
- d->custom_optind = 1; /* Don't scan ARGV[0], the program name. */
- custom_getopt_initialize(d);
- }
- if (d->nextchar == NULL || *d->nextchar == '\0') {
- ret = shuffle_argv(argc, argv, longopts, d);
- if (ret)
- return ret;
- }
- if (longopts && (argv[d->custom_optind][1] == '-' ))
- return check_long_opt(argc, argv, optstring, longopts,
- longind, print_errors, d);
- return check_short_opt(argc, argv, optstring, print_errors, d);
-}
-
-static int custom_getopt_internal(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind)
-{
- int result;
- /* Keep a global copy of all internal members of d */
- static struct custom_getopt_data d;
-
- d.custom_optind = custom_optind;
- d.custom_opterr = custom_opterr;
- result = getopt_internal_r(argc, argv, optstring, longopts,
- longind, &d);
- custom_optind = d.custom_optind;
- custom_optarg = d.custom_optarg;
- custom_optopt = d.custom_optopt;
- return result;
-}
-
-static int custom_getopt_long (int argc, char *const *argv, const char *options,
- const struct option *long_options, int *opt_index)
-{
- return custom_getopt_internal(argc, argv, options, long_options,
- opt_index);
-}
-
static char *package_name = 0;
@@ -1727,11 +1136,6 @@ cmdline_parser_internal (
int initialize;
int check_required;
int check_ambiguity;
-
- char *optarg;
- int optind;
- int opterr;
- int optopt;
package_name = argv[0];
@@ -1812,17 +1216,7 @@ cmdline_parser_internal (
{ 0, 0, 0, 0 }
};
- custom_optarg = optarg;
- custom_optind = optind;
- custom_opterr = opterr;
- custom_optopt = optopt;
-
- c = custom_getopt_long (argc, argv, "hVr:vp::u::c::m::N::RUC:A:P:bt:", long_options, &option_index);
-
- optarg = custom_optarg;
- optind = custom_optind;
- opterr = custom_opterr;
- optopt = custom_optopt;
+ c = getopt_long (argc, argv, "hVr:vp::u::c::m::N::RUC:A:P:bt:", long_options, &option_index);
if (c == -1) break; /* Exit from `while (1)' loop. */
diff --git a/src/tools/openpgp-tool.c b/src/tools/openpgp-tool.c
index 3e4ce527..dcff9f8c 100644
--- a/src/tools/openpgp-tool.c
+++ b/src/tools/openpgp-tool.c
@@ -37,7 +37,7 @@
#include
#include
-#include "common/compat_getopt.h"
+#include
#include "libopensc/opensc.h"
#include "libopensc/asn1.h"
#include "libopensc/cards.h"
diff --git a/src/tools/opensc-asn1-cmdline.c b/src/tools/opensc-asn1-cmdline.c
index cafbcd55..f8b20b94 100644
--- a/src/tools/opensc-asn1-cmdline.c
+++ b/src/tools/opensc-asn1-cmdline.c
@@ -1,7 +1,7 @@
/*
File autogenerated by gengetopt version 2.22.6
generated with the following command:
- /usr/bin/gengetopt --include-getopt --file-name=opensc-asn1-cmdline --output-dir=. --unamed-opts
+ /usr/bin/gengetopt --file-name=opensc-asn1-cmdline --output-dir=. --unamed-opts
The developers of gengetopt consider the fixed text that goes in all
gengetopt output files to be in the public domain:
@@ -21,6 +21,7 @@
#define FIX_UNUSED(X) (void) (X) /* avoid warnings for unused params */
#endif
+#include
#include "opensc-asn1-cmdline.h"
@@ -292,598 +293,6 @@ cmdline_parser_required (struct gengetopt_args_info *args_info, const char *prog
return EXIT_SUCCESS;
}
-/*
- * Extracted from the glibc source tree, version 2.3.6
- *
- * Licensed under the GPL as per the whole glibc source tree.
- *
- * This file was modified so that getopt_long can be called
- * many times without risking previous memory to be spoiled.
- *
- * Modified by Andre Noll and Lorenzo Bettini for use in
- * GNU gengetopt generated files.
- *
- */
-
-/*
- * we must include anything we need since this file is not thought to be
- * inserted in a file already using getopt.h
- *
- * Lorenzo
- */
-
-struct option
-{
- const char *name;
- /* 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;
-};
-
-/* 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.
-*/
-/*
- 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 `custom_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. */
-
-/* Names for the values of the `has_arg' field of `struct option'. */
-#ifndef no_argument
-#define no_argument 0
-#endif
-
-#ifndef required_argument
-#define required_argument 1
-#endif
-
-#ifndef optional_argument
-#define optional_argument 2
-#endif
-
-struct custom_getopt_data {
- /*
- * These have exactly the same meaning as the corresponding global variables,
- * except that they are used for the reentrant versions of getopt.
- */
- int custom_optind;
- int custom_opterr;
- int custom_optopt;
- char *custom_optarg;
-
- /* True if the internal members have been initialized. */
- int initialized;
-
- /*
- * 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.
- */
- char *nextchar;
-
- /*
- * 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.
- */
- int first_nonopt;
- int last_nonopt;
-};
-
-/*
- * the variables optarg, optind, opterr and optopt are renamed with
- * the custom_ prefix so that they don't interfere with getopt ones.
- *
- * Moreover they're static so they are visible only from within the
- * file where this very file will be included.
- */
-
-/*
- * For communication from `custom_getopt' to the caller. When `custom_getopt' finds an
- * option that takes an argument, the argument value is returned here.
- */
-static char *custom_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 `custom_getopt'.
- *
- * On entry to `custom_getopt', 1 means this is the first call; initialize.
- *
- * When `custom_getopt' returns -1, this is the index of the first of the non-option
- * elements that the caller should itself scan.
- *
- * Otherwise, `custom_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.
- */
-static int custom_optind = 1;
-
-/*
- * Callers store zero here to inhibit the error message for unrecognized
- * options.
- */
-static int custom_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.
- */
-static int custom_optopt = '?';
-
-/*
- * 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,custom_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(char **argv, struct custom_getopt_data *d)
-{
- int bottom = d->first_nonopt;
- int middle = d->last_nonopt;
- int top = d->custom_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.
- */
- while (top > middle && middle > bottom) {
- if (top - middle > middle - bottom) {
- /* Bottom segment is the short one. */
- int len = middle - bottom;
- 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;
- }
- /* Exclude the moved bottom segment from further swapping. */
- top -= len;
- } else {
- /* Top segment is the short one. */
- int len = top - middle;
- 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;
- }
- /* Exclude the moved top segment from further swapping. */
- bottom += len;
- }
- }
- /* Update records for the slots the non-options now occupy. */
- d->first_nonopt += (d->custom_optind - d->last_nonopt);
- d->last_nonopt = d->custom_optind;
-}
-
-/* Initialize the internal data when the first call is made. */
-static void custom_getopt_initialize(struct custom_getopt_data *d)
-{
- /*
- * 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.
- */
- d->first_nonopt = d->last_nonopt = d->custom_optind;
- d->nextchar = NULL;
- d->initialized = 1;
-}
-
-#define NONOPTION_P (argv[d->custom_optind][0] != '-' || argv[d->custom_optind][1] == '\0')
-
-/* return: zero: continue, nonzero: return given value to user */
-static int shuffle_argv(int argc, char *const *argv,const struct option *longopts,
- struct custom_getopt_data *d)
-{
- /*
- * Give FIRST_NONOPT & LAST_NONOPT rational values if CUSTOM_OPTIND has been
- * moved back by the user (who may also have changed the arguments).
- */
- if (d->last_nonopt > d->custom_optind)
- d->last_nonopt = d->custom_optind;
- if (d->first_nonopt > d->custom_optind)
- d->first_nonopt = d->custom_optind;
- /*
- * If we have just processed some options following some
- * non-options, exchange them so that the options come first.
- */
- if (d->first_nonopt != d->last_nonopt &&
- d->last_nonopt != d->custom_optind)
- exchange((char **) argv, d);
- else if (d->last_nonopt != d->custom_optind)
- d->first_nonopt = d->custom_optind;
- /*
- * Skip any additional non-options and extend the range of
- * non-options previously skipped.
- */
- while (d->custom_optind < argc && NONOPTION_P)
- d->custom_optind++;
- d->last_nonopt = d->custom_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 (d->custom_optind != argc && !strcmp(argv[d->custom_optind], "--")) {
- d->custom_optind++;
- if (d->first_nonopt != d->last_nonopt
- && d->last_nonopt != d->custom_optind)
- exchange((char **) argv, d);
- else if (d->first_nonopt == d->last_nonopt)
- d->first_nonopt = d->custom_optind;
- d->last_nonopt = argc;
- d->custom_optind = argc;
- }
- /*
- * If we have done all the ARGV-elements, stop the scan and back over
- * any non-options that we skipped and permuted.
- */
- if (d->custom_optind == argc) {
- /*
- * Set the next-arg-index to point at the non-options that we
- * previously skipped, so the caller will digest them.
- */
- if (d->first_nonopt != d->last_nonopt)
- d->custom_optind = d->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) {
- d->custom_optarg = argv[d->custom_optind++];
- return 1;
- }
- /*
- * We have found another option-ARGV-element. Skip the initial
- * punctuation.
- */
- d->nextchar = (argv[d->custom_optind] + 1 + (longopts != NULL && argv[d->custom_optind][1] == '-'));
- return 0;
-}
-
-/*
- * Check whether the ARGV-element is a long option.
- *
- * If there's a long option "fubar" and the ARGV-element is "-fu", 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.
- *
- */
-static int check_long_opt(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind,
- int print_errors, struct custom_getopt_data *d)
-{
- 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 = d->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, d->nextchar, nameend - d->nextchar)) {
- if ((unsigned int) (nameend - d->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 if (pfound->has_arg != p->has_arg
- || pfound->flag != p->flag
- || pfound->val != p->val)
- /* Second or later nonexact match found. */
- ambig = 1;
- }
- if (ambig && !exact) {
- if (print_errors) {
- fprintf(stderr,
- "%s: option `%s' is ambiguous\n",
- argv[0], argv[d->custom_optind]);
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optind++;
- d->custom_optopt = 0;
- return '?';
- }
- if (pfound) {
- option_index = indfound;
- d->custom_optind++;
- if (*nameend) {
- if (pfound->has_arg != no_argument)
- d->custom_optarg = nameend + 1;
- else {
- if (print_errors) {
- if (argv[d->custom_optind - 1][1] == '-') {
- /* --option */
- fprintf(stderr, "%s: option `--%s' doesn't allow an argument\n",
- argv[0], pfound->name);
- } else {
- /* +option or -option */
- fprintf(stderr, "%s: option `%c%s' doesn't allow an argument\n",
- argv[0], argv[d->custom_optind - 1][0], pfound->name);
- }
-
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optopt = pfound->val;
- return '?';
- }
- } else if (pfound->has_arg == required_argument) {
- if (d->custom_optind < argc)
- d->custom_optarg = argv[d->custom_optind++];
- else {
- if (print_errors) {
- fprintf(stderr,
- "%s: option `%s' requires an argument\n",
- argv[0],
- argv[d->custom_optind - 1]);
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optopt = pfound->val;
- return optstring[0] == ':' ? ':' : '?';
- }
- }
- d->nextchar += strlen(d->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 (print_errors) {
- if (argv[d->custom_optind][1] == '-') {
- /* --option */
- fprintf(stderr,
- "%s: unrecognized option `--%s'\n",
- argv[0], d->nextchar);
- } else {
- /* +option or -option */
- fprintf(stderr,
- "%s: unrecognized option `%c%s'\n",
- argv[0], argv[d->custom_optind][0],
- d->nextchar);
- }
- }
- d->nextchar = (char *) "";
- d->custom_optind++;
- d->custom_optopt = 0;
- return '?';
-}
-
-static int check_short_opt(int argc, char *const *argv, const char *optstring,
- int print_errors, struct custom_getopt_data *d)
-{
- char c = *d->nextchar++;
- const char *temp = strchr(optstring, c);
-
- /* Increment `custom_optind' when we start to process its last character. */
- if (*d->nextchar == '\0')
- ++d->custom_optind;
- if (!temp || c == ':') {
- if (print_errors)
- fprintf(stderr, "%s: invalid option -- %c\n", argv[0], c);
-
- d->custom_optopt = c;
- return '?';
- }
- if (temp[1] == ':') {
- if (temp[2] == ':') {
- /* This is an option that accepts an argument optionally. */
- if (*d->nextchar != '\0') {
- d->custom_optarg = d->nextchar;
- d->custom_optind++;
- } else
- d->custom_optarg = NULL;
- d->nextchar = NULL;
- } else {
- /* This is an option that requires an argument. */
- if (*d->nextchar != '\0') {
- d->custom_optarg = d->nextchar;
- /*
- * If we end this ARGV-element by taking the
- * rest as an arg, we must advance to the next
- * element now.
- */
- d->custom_optind++;
- } else if (d->custom_optind == argc) {
- if (print_errors) {
- fprintf(stderr,
- "%s: option requires an argument -- %c\n",
- argv[0], c);
- }
- d->custom_optopt = c;
- if (optstring[0] == ':')
- c = ':';
- else
- c = '?';
- } else
- /*
- * We already incremented `custom_optind' once;
- * increment it again when taking next ARGV-elt
- * as argument.
- */
- d->custom_optarg = argv[d->custom_optind++];
- d->nextchar = NULL;
- }
- }
- return c;
-}
-
-/*
- * Scan elements of ARGV 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 `custom_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 `custom_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 `custom_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 `custom_optarg'. Two colons mean an option that
- * wants an optional arg; if there is text in the current ARGV-element,
- * it is returned in `custom_optarg', otherwise `custom_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.
- *
- * Return the option character from OPTS just read. Return -1 when there are
- * no more options. For unrecognized options, or options missing arguments,
- * `custom_optopt' is set to the option letter, and '?' is returned.
- *
- * The OPTS string is a list of characters which are recognized option letters,
- * optionally followed by colons, specifying that that letter takes an
- * argument, to be placed in `custom_optarg'.
- *
- * If a letter in OPTS is followed by two colons, its argument is optional.
- * This behavior is specific to the GNU `getopt'.
- *
- * The argument `--' causes premature termination of argument scanning,
- * explicitly telling `getopt' that there are no more options. If OPTS begins
- * with `--', then non-option arguments are treated as arguments to the option
- * '\0'. This behavior is specific to the GNU `getopt'.
- */
-
-static int getopt_internal_r(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind,
- struct custom_getopt_data *d)
-{
- int ret, print_errors = d->custom_opterr;
-
- if (optstring[0] == ':')
- print_errors = 0;
- if (argc < 1)
- return -1;
- d->custom_optarg = NULL;
-
- /*
- * This is a big difference with GNU getopt, since optind == 0
- * means initialization while here 1 means first call.
- */
- if (d->custom_optind == 0 || !d->initialized) {
- if (d->custom_optind == 0)
- d->custom_optind = 1; /* Don't scan ARGV[0], the program name. */
- custom_getopt_initialize(d);
- }
- if (d->nextchar == NULL || *d->nextchar == '\0') {
- ret = shuffle_argv(argc, argv, longopts, d);
- if (ret)
- return ret;
- }
- if (longopts && (argv[d->custom_optind][1] == '-' ))
- return check_long_opt(argc, argv, optstring, longopts,
- longind, print_errors, d);
- return check_short_opt(argc, argv, optstring, print_errors, d);
-}
-
-static int custom_getopt_internal(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind)
-{
- int result;
- /* Keep a global copy of all internal members of d */
- static struct custom_getopt_data d;
-
- d.custom_optind = custom_optind;
- d.custom_opterr = custom_opterr;
- result = getopt_internal_r(argc, argv, optstring, longopts,
- longind, &d);
- custom_optind = d.custom_optind;
- custom_optarg = d.custom_optarg;
- custom_optopt = d.custom_optopt;
- return result;
-}
-
-static int custom_getopt_long (int argc, char *const *argv, const char *options,
- const struct option *long_options, int *opt_index)
-{
- return custom_getopt_internal(argc, argv, options, long_options,
- opt_index);
-}
-
static char *package_name = 0;
@@ -903,11 +312,6 @@ cmdline_parser_internal (
int initialize;
int check_required;
int check_ambiguity;
-
- char *optarg;
- int optind;
- int opterr;
- int optopt;
package_name = argv[0];
@@ -936,17 +340,7 @@ cmdline_parser_internal (
{ 0, 0, 0, 0 }
};
- custom_optarg = optarg;
- custom_optind = optind;
- custom_opterr = opterr;
- custom_optopt = optopt;
-
- c = custom_getopt_long (argc, argv, "hV", long_options, &option_index);
-
- optarg = custom_optarg;
- optind = custom_optind;
- opterr = custom_opterr;
- optopt = custom_optopt;
+ c = getopt_long (argc, argv, "hV", long_options, &option_index);
if (c == -1) break; /* Exit from `while (1)' loop. */
@@ -990,12 +384,20 @@ cmdline_parser_internal (
(this may happen with some implementations of getopt,
but surely not with the one included by gengetopt) */
+ i = optind;
+ while (i < argc)
+ if (argv[i++] == argv[0]) {
+ found_prog_name = 1;
+ break;
+ }
+ i = 0;
args_info->inputs_num = argc - optind - found_prog_name;
args_info->inputs =
(char **)(malloc ((args_info->inputs_num)*sizeof(char *))) ;
while (optind < argc)
- args_info->inputs[ i++ ] = gengetopt_strdup (argv[optind++]) ;
+ if (argv[optind++] != argv[0])
+ args_info->inputs[ i++ ] = gengetopt_strdup (argv[optind-1]) ;
}
return 0;
diff --git a/src/tools/opensc-explorer.c b/src/tools/opensc-explorer.c
index 0da867f5..25c88be8 100644
--- a/src/tools/opensc-explorer.c
+++ b/src/tools/opensc-explorer.c
@@ -42,7 +42,7 @@
#include "libopensc/cards.h"
#include "libopensc/log.h"
#include "common/compat_strlcpy.h"
-#include "common/compat_getopt.h"
+#include
#include "util.h"
#define DIM(v) (sizeof(v)/sizeof((v)[0]))
diff --git a/src/tools/opensc-notify-cmdline.c b/src/tools/opensc-notify-cmdline.c
index 4870aa28..3fe2fcd2 100644
--- a/src/tools/opensc-notify-cmdline.c
+++ b/src/tools/opensc-notify-cmdline.c
@@ -1,7 +1,7 @@
/*
File autogenerated by gengetopt version 2.22.6
generated with the following command:
- /usr/bin/gengetopt --include-getopt --file-name=opensc-notify-cmdline --output-dir=.
+ /usr/bin/gengetopt --file-name=opensc-notify-cmdline --output-dir=.
The developers of gengetopt consider the fixed text that goes in all
gengetopt output files to be in the public domain:
@@ -21,6 +21,7 @@
#define FIX_UNUSED(X) (void) (X) /* avoid warnings for unused params */
#endif
+#include
#include "opensc-notify-cmdline.h"
@@ -342,598 +343,6 @@ cmdline_parser_required (struct gengetopt_args_info *args_info, const char *prog
return EXIT_SUCCESS;
}
-/*
- * Extracted from the glibc source tree, version 2.3.6
- *
- * Licensed under the GPL as per the whole glibc source tree.
- *
- * This file was modified so that getopt_long can be called
- * many times without risking previous memory to be spoiled.
- *
- * Modified by Andre Noll and Lorenzo Bettini for use in
- * GNU gengetopt generated files.
- *
- */
-
-/*
- * we must include anything we need since this file is not thought to be
- * inserted in a file already using getopt.h
- *
- * Lorenzo
- */
-
-struct option
-{
- const char *name;
- /* 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;
-};
-
-/* 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.
-*/
-/*
- 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 `custom_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. */
-
-/* Names for the values of the `has_arg' field of `struct option'. */
-#ifndef no_argument
-#define no_argument 0
-#endif
-
-#ifndef required_argument
-#define required_argument 1
-#endif
-
-#ifndef optional_argument
-#define optional_argument 2
-#endif
-
-struct custom_getopt_data {
- /*
- * These have exactly the same meaning as the corresponding global variables,
- * except that they are used for the reentrant versions of getopt.
- */
- int custom_optind;
- int custom_opterr;
- int custom_optopt;
- char *custom_optarg;
-
- /* True if the internal members have been initialized. */
- int initialized;
-
- /*
- * 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.
- */
- char *nextchar;
-
- /*
- * 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.
- */
- int first_nonopt;
- int last_nonopt;
-};
-
-/*
- * the variables optarg, optind, opterr and optopt are renamed with
- * the custom_ prefix so that they don't interfere with getopt ones.
- *
- * Moreover they're static so they are visible only from within the
- * file where this very file will be included.
- */
-
-/*
- * For communication from `custom_getopt' to the caller. When `custom_getopt' finds an
- * option that takes an argument, the argument value is returned here.
- */
-static char *custom_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 `custom_getopt'.
- *
- * On entry to `custom_getopt', 1 means this is the first call; initialize.
- *
- * When `custom_getopt' returns -1, this is the index of the first of the non-option
- * elements that the caller should itself scan.
- *
- * Otherwise, `custom_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.
- */
-static int custom_optind = 1;
-
-/*
- * Callers store zero here to inhibit the error message for unrecognized
- * options.
- */
-static int custom_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.
- */
-static int custom_optopt = '?';
-
-/*
- * 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,custom_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(char **argv, struct custom_getopt_data *d)
-{
- int bottom = d->first_nonopt;
- int middle = d->last_nonopt;
- int top = d->custom_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.
- */
- while (top > middle && middle > bottom) {
- if (top - middle > middle - bottom) {
- /* Bottom segment is the short one. */
- int len = middle - bottom;
- 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;
- }
- /* Exclude the moved bottom segment from further swapping. */
- top -= len;
- } else {
- /* Top segment is the short one. */
- int len = top - middle;
- 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;
- }
- /* Exclude the moved top segment from further swapping. */
- bottom += len;
- }
- }
- /* Update records for the slots the non-options now occupy. */
- d->first_nonopt += (d->custom_optind - d->last_nonopt);
- d->last_nonopt = d->custom_optind;
-}
-
-/* Initialize the internal data when the first call is made. */
-static void custom_getopt_initialize(struct custom_getopt_data *d)
-{
- /*
- * 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.
- */
- d->first_nonopt = d->last_nonopt = d->custom_optind;
- d->nextchar = NULL;
- d->initialized = 1;
-}
-
-#define NONOPTION_P (argv[d->custom_optind][0] != '-' || argv[d->custom_optind][1] == '\0')
-
-/* return: zero: continue, nonzero: return given value to user */
-static int shuffle_argv(int argc, char *const *argv,const struct option *longopts,
- struct custom_getopt_data *d)
-{
- /*
- * Give FIRST_NONOPT & LAST_NONOPT rational values if CUSTOM_OPTIND has been
- * moved back by the user (who may also have changed the arguments).
- */
- if (d->last_nonopt > d->custom_optind)
- d->last_nonopt = d->custom_optind;
- if (d->first_nonopt > d->custom_optind)
- d->first_nonopt = d->custom_optind;
- /*
- * If we have just processed some options following some
- * non-options, exchange them so that the options come first.
- */
- if (d->first_nonopt != d->last_nonopt &&
- d->last_nonopt != d->custom_optind)
- exchange((char **) argv, d);
- else if (d->last_nonopt != d->custom_optind)
- d->first_nonopt = d->custom_optind;
- /*
- * Skip any additional non-options and extend the range of
- * non-options previously skipped.
- */
- while (d->custom_optind < argc && NONOPTION_P)
- d->custom_optind++;
- d->last_nonopt = d->custom_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 (d->custom_optind != argc && !strcmp(argv[d->custom_optind], "--")) {
- d->custom_optind++;
- if (d->first_nonopt != d->last_nonopt
- && d->last_nonopt != d->custom_optind)
- exchange((char **) argv, d);
- else if (d->first_nonopt == d->last_nonopt)
- d->first_nonopt = d->custom_optind;
- d->last_nonopt = argc;
- d->custom_optind = argc;
- }
- /*
- * If we have done all the ARGV-elements, stop the scan and back over
- * any non-options that we skipped and permuted.
- */
- if (d->custom_optind == argc) {
- /*
- * Set the next-arg-index to point at the non-options that we
- * previously skipped, so the caller will digest them.
- */
- if (d->first_nonopt != d->last_nonopt)
- d->custom_optind = d->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) {
- d->custom_optarg = argv[d->custom_optind++];
- return 1;
- }
- /*
- * We have found another option-ARGV-element. Skip the initial
- * punctuation.
- */
- d->nextchar = (argv[d->custom_optind] + 1 + (longopts != NULL && argv[d->custom_optind][1] == '-'));
- return 0;
-}
-
-/*
- * Check whether the ARGV-element is a long option.
- *
- * If there's a long option "fubar" and the ARGV-element is "-fu", 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.
- *
- */
-static int check_long_opt(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind,
- int print_errors, struct custom_getopt_data *d)
-{
- 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 = d->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, d->nextchar, nameend - d->nextchar)) {
- if ((unsigned int) (nameend - d->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 if (pfound->has_arg != p->has_arg
- || pfound->flag != p->flag
- || pfound->val != p->val)
- /* Second or later nonexact match found. */
- ambig = 1;
- }
- if (ambig && !exact) {
- if (print_errors) {
- fprintf(stderr,
- "%s: option `%s' is ambiguous\n",
- argv[0], argv[d->custom_optind]);
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optind++;
- d->custom_optopt = 0;
- return '?';
- }
- if (pfound) {
- option_index = indfound;
- d->custom_optind++;
- if (*nameend) {
- if (pfound->has_arg != no_argument)
- d->custom_optarg = nameend + 1;
- else {
- if (print_errors) {
- if (argv[d->custom_optind - 1][1] == '-') {
- /* --option */
- fprintf(stderr, "%s: option `--%s' doesn't allow an argument\n",
- argv[0], pfound->name);
- } else {
- /* +option or -option */
- fprintf(stderr, "%s: option `%c%s' doesn't allow an argument\n",
- argv[0], argv[d->custom_optind - 1][0], pfound->name);
- }
-
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optopt = pfound->val;
- return '?';
- }
- } else if (pfound->has_arg == required_argument) {
- if (d->custom_optind < argc)
- d->custom_optarg = argv[d->custom_optind++];
- else {
- if (print_errors) {
- fprintf(stderr,
- "%s: option `%s' requires an argument\n",
- argv[0],
- argv[d->custom_optind - 1]);
- }
- d->nextchar += strlen(d->nextchar);
- d->custom_optopt = pfound->val;
- return optstring[0] == ':' ? ':' : '?';
- }
- }
- d->nextchar += strlen(d->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 (print_errors) {
- if (argv[d->custom_optind][1] == '-') {
- /* --option */
- fprintf(stderr,
- "%s: unrecognized option `--%s'\n",
- argv[0], d->nextchar);
- } else {
- /* +option or -option */
- fprintf(stderr,
- "%s: unrecognized option `%c%s'\n",
- argv[0], argv[d->custom_optind][0],
- d->nextchar);
- }
- }
- d->nextchar = (char *) "";
- d->custom_optind++;
- d->custom_optopt = 0;
- return '?';
-}
-
-static int check_short_opt(int argc, char *const *argv, const char *optstring,
- int print_errors, struct custom_getopt_data *d)
-{
- char c = *d->nextchar++;
- const char *temp = strchr(optstring, c);
-
- /* Increment `custom_optind' when we start to process its last character. */
- if (*d->nextchar == '\0')
- ++d->custom_optind;
- if (!temp || c == ':') {
- if (print_errors)
- fprintf(stderr, "%s: invalid option -- %c\n", argv[0], c);
-
- d->custom_optopt = c;
- return '?';
- }
- if (temp[1] == ':') {
- if (temp[2] == ':') {
- /* This is an option that accepts an argument optionally. */
- if (*d->nextchar != '\0') {
- d->custom_optarg = d->nextchar;
- d->custom_optind++;
- } else
- d->custom_optarg = NULL;
- d->nextchar = NULL;
- } else {
- /* This is an option that requires an argument. */
- if (*d->nextchar != '\0') {
- d->custom_optarg = d->nextchar;
- /*
- * If we end this ARGV-element by taking the
- * rest as an arg, we must advance to the next
- * element now.
- */
- d->custom_optind++;
- } else if (d->custom_optind == argc) {
- if (print_errors) {
- fprintf(stderr,
- "%s: option requires an argument -- %c\n",
- argv[0], c);
- }
- d->custom_optopt = c;
- if (optstring[0] == ':')
- c = ':';
- else
- c = '?';
- } else
- /*
- * We already incremented `custom_optind' once;
- * increment it again when taking next ARGV-elt
- * as argument.
- */
- d->custom_optarg = argv[d->custom_optind++];
- d->nextchar = NULL;
- }
- }
- return c;
-}
-
-/*
- * Scan elements of ARGV 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 `custom_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 `custom_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 `custom_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 `custom_optarg'. Two colons mean an option that
- * wants an optional arg; if there is text in the current ARGV-element,
- * it is returned in `custom_optarg', otherwise `custom_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.
- *
- * Return the option character from OPTS just read. Return -1 when there are
- * no more options. For unrecognized options, or options missing arguments,
- * `custom_optopt' is set to the option letter, and '?' is returned.
- *
- * The OPTS string is a list of characters which are recognized option letters,
- * optionally followed by colons, specifying that that letter takes an
- * argument, to be placed in `custom_optarg'.
- *
- * If a letter in OPTS is followed by two colons, its argument is optional.
- * This behavior is specific to the GNU `getopt'.
- *
- * The argument `--' causes premature termination of argument scanning,
- * explicitly telling `getopt' that there are no more options. If OPTS begins
- * with `--', then non-option arguments are treated as arguments to the option
- * '\0'. This behavior is specific to the GNU `getopt'.
- */
-
-static int getopt_internal_r(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind,
- struct custom_getopt_data *d)
-{
- int ret, print_errors = d->custom_opterr;
-
- if (optstring[0] == ':')
- print_errors = 0;
- if (argc < 1)
- return -1;
- d->custom_optarg = NULL;
-
- /*
- * This is a big difference with GNU getopt, since optind == 0
- * means initialization while here 1 means first call.
- */
- if (d->custom_optind == 0 || !d->initialized) {
- if (d->custom_optind == 0)
- d->custom_optind = 1; /* Don't scan ARGV[0], the program name. */
- custom_getopt_initialize(d);
- }
- if (d->nextchar == NULL || *d->nextchar == '\0') {
- ret = shuffle_argv(argc, argv, longopts, d);
- if (ret)
- return ret;
- }
- if (longopts && (argv[d->custom_optind][1] == '-' ))
- return check_long_opt(argc, argv, optstring, longopts,
- longind, print_errors, d);
- return check_short_opt(argc, argv, optstring, print_errors, d);
-}
-
-static int custom_getopt_internal(int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind)
-{
- int result;
- /* Keep a global copy of all internal members of d */
- static struct custom_getopt_data d;
-
- d.custom_optind = custom_optind;
- d.custom_opterr = custom_opterr;
- result = getopt_internal_r(argc, argv, optstring, longopts,
- longind, &d);
- custom_optind = d.custom_optind;
- custom_optarg = d.custom_optarg;
- custom_optopt = d.custom_optopt;
- return result;
-}
-
-static int custom_getopt_long (int argc, char *const *argv, const char *options,
- const struct option *long_options, int *opt_index)
-{
- return custom_getopt_internal(argc, argv, options, long_options,
- opt_index);
-}
-
static char *package_name = 0;
@@ -1074,11 +483,6 @@ cmdline_parser_internal (
int initialize;
int check_required;
int check_ambiguity;
-
- char *optarg;
- int optind;
- int opterr;
- int optopt;
package_name = argv[0];
@@ -1113,17 +517,7 @@ cmdline_parser_internal (
{ 0, 0, 0, 0 }
};
- custom_optarg = optarg;
- custom_optind = optind;
- custom_opterr = opterr;
- custom_optopt = optopt;
-
- c = custom_getopt_long (argc, argv, "hVt::m::IRGB", long_options, &option_index);
-
- optarg = custom_optarg;
- optind = custom_optind;
- opterr = custom_opterr;
- optopt = custom_optopt;
+ c = getopt_long (argc, argv, "hVt::m::IRGB", long_options, &option_index);
if (c == -1) break; /* Exit from `while (1)' loop. */
diff --git a/src/tools/util.h b/src/tools/util.h
index d3a15570..26b60c29 100644
--- a/src/tools/util.h
+++ b/src/tools/util.h
@@ -16,7 +16,7 @@
#endif
#include
-#include "common/compat_getopt.h"
+#include
#include "libopensc/opensc.h"
#ifdef __cplusplus