X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_getopt.c;h=7d157a0ee41bd0efe5760b7a8fc4d0e1ea8723fc;hb=refs%2Fheads%2Fmaster;hp=a74ff88de7a6bcc140c492cd2da5d5158414d471;hpb=46a2db0465372eae273b1ff827e465a779339198;p=rrdtool.git

diff --git a/src/rrd_getopt.c b/src/rrd_getopt.c
index a74ff88..7d157a0 100644
--- 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"
 
@@ -360,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
@@ -395,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;
@@ -465,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,
@@ -869,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.  */
 
 #ifdef TEST