Merged branch 'upstream'.

[pkg-rrdtool.git] / src / rrd_cgi.c

diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c
index 8ce7fba3792150fdd22c53b7c548e3497c34a7ef..ee003c96e1cf08ed8f9bc65839244144116cc277 100644 (file)
--- a/src/rrd_cgi.c
+++ b/src/rrd_cgi.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.4.3  Copyright by Tobi Oetiker, 1997-2010
+ * RRDtool 1.4.8  Copyright by Tobi Oetiker, 1997-2013
  *****************************************************************************
  * rrd_cgi.c  RRD Web Page Generator
  *****************************************************************************/
@@ -9,6 +9,11 @@
 #include <stdlib.h>
 #endif
 
+#ifdef WIN32
+   #define strcasecmp stricmp
+   #define strcasencmp strnicmp
+#endif
+
 #define MEMBLK 1024
 /*#define DEBUG_PARSER
 #define DEBUG_VARS*/
@@ -453,9 +458,7 @@ int main(
     int argc,
     char *argv[])
 {
-    long      length;
     char     *buffer;
-    char     *server_url = NULL;
     long      i;
     long      filter = 0;
     struct option long_options[] = {
@@ -497,7 +500,6 @@ int main(
     if (!filter) {
         rrdcgiDebug(0, 0);
         rrdcgiArg = rrdcgiInit();
-        server_url = getenv("SERVER_URL");
     }
 
     /* make sure we have one extra argument, 
@@ -511,7 +513,7 @@ int main(
         fprintf(stderr, "ERROR: expected a filename\n");
         exit(1);
     } else {
-        length = readfile(argv[optind], &buffer, 1);
+        readfile(argv[optind], &buffer, 1);
     }
 
     if (rrd_test_error()) {
@@ -1253,11 +1255,6 @@ int parse(
         val = func(argc, (const char **) args);
         free(args-1);
     } else {
-        /* unable to parse arguments, undo 0-termination by scanargs */
-        for (; argc > 0; argc--) {
-            *((args[argc - 1]) - 1) = ' ';
-        }
-
         /* next call, try parsing at current offset +1 */
         end = (*buf) + i + 1;