diff --git a/src/rrd_getopt.c b/src/rrd_getopt.c
index dbb3f3f76dd76630b112c01e875adcf657d2a2af..0556c86a82602e2a3ea5c413d4e17cbd56a8a181 100644 (file)
--- a/src/rrd_getopt.c
+++ b/src/rrd_getopt.c
Also, when `ordering' is RETURN_IN_ORDER,
each non-option ARGV-element is returned here. */
+/*
+ * On some versions of Solaris, opterr and friends are defined in core libc
+ * rather than in a separate getopt module. Define these variables only
+ * if configure found they aren't there by default. (We assume that testing
+ * opterr is sufficient for all of these except optreset.)
+ */
+#ifndef HAVE_INT_OPTERR
+
char *optarg = NULL;
/* Index in ARGV of the next element to be scanned.
Otherwise, `optind' communicates from one call to the next
how much of ARGV has been scanned so far. */
+/* Callers store zero here to inhibit the error message
+ for unrecognized options. */
+
+int opterr = 1;
+
+/* Set to an option character which was unrecognized.
+ This must be initialized on some systems to avoid linking in the
+ system's own getopt implementation. */
+
+int optopt = '?';
+
/* 1003.2 says this must be 1 before any call. */
int optind = 1;
+#else
+ extern int opterr;
+ extern int optind;
+ extern int optopt;
+ extern char *optarg;
+#endif
+
+
/* Formerly, initialization of getopt depended on optind==0, which
causes problems with re-calling getopt as programs generally don't
know that. */
static char *nextchar;
-/* Callers store zero here to inhibit the error message
- for unrecognized options. */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
- This must be initialized on some systems to avoid linking in the
- system's own getopt implementation. */
-
-int optopt = '?';
/* Describe how to deal with options that follow non-option ARGV-elements.
to getopt is that one passed to the process. */
static void store_args(
int argc,
- char *const *argv) __attribute__ ((unused));
+ char *const *argv);
+
static void store_args(
int argc,
char *const *argv)
const char *);
#endif
static const char* _getopt_initialize(int argc,
- char** argv,
+ char* const* argv,
const char* optstring)
{
/* Start processing options with ARGV-element 1 (since ARGV-element 0
long-named options. */
int _getopt_internal(int argc,
- char** argv,
+ char* const* argv,
const char *optstring,
const struct option *longopts,
int* longind,
}
}
-int getopt(
- int argc,
- char** argv,
- const char* optstring)
-{
- return _getopt_internal(argc, argv, optstring,
- (const struct option *) 0, (int *) 0, 0);
-}
-
#endif /* Not ELIDE_CODE. */
\f
#ifdef TEST