use snprintf, strdup, ... where possible to make for safer operation -- Martin Pelikan

[rrdtool.git] / src / rrd_getopt.c

diff --git a/src/rrd_getopt.c b/src/rrd_getopt.c
index dbb3f3f..7d157a0 100644 (file)
--- a/src/rrd_getopt.c
+++ b/src/rrd_getopt.c
@@ -39,10 +39,11 @@
 #endif
 #endif
 
-
+#ifndef WIN32
 #ifdef HAVE_CONFIG_H
 #include "../rrd_config.h"
 #endif
+#endif
 
 #include "rrd_i18n.h"
 
@@ -112,6 +113,14 @@
    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.
@@ -126,9 +135,28 @@ char     *optarg = NULL;
    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. */
@@ -144,16 +172,6 @@ int       __getopt_initialized = 0;
 
 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.
 
@@ -257,7 +275,8 @@ static char *const *original_argv;
    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)
@@ -342,7 +361,7 @@ static const char *_getopt_initialize(
     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
@@ -377,7 +396,7 @@ static const char* _getopt_initialize(int argc,
            considered as options.  */
         char      var[100];
 
-        sprintf(var, "_%d_GNU_nonoption_argv_flags_", getpid());
+        snprintf(var, sizeof var, "_%d_GNU_nonoption_argv_flags_", getpid());
         nonoption_flags = getenv(var);
         if (nonoption_flags == NULL)
             nonoption_flags_len = 0;
@@ -447,7 +466,11 @@ static const char* _getopt_initialize(int argc,
    long-named options.  */
 
 int _getopt_internal(int argc,
+#ifdef WIN32
                      char** argv,
+#else // WIN32
+                     char* const* argv,
+#endif //WIN32
                      const char *optstring,
                      const struct option *longopts,
                      int* longind,
@@ -851,15 +874,6 @@ int _getopt_internal(int argc,
     }
 }
 
-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