X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_cgi.c;h=2daa5a5f13ad1f9b3ecd39b393001d6c3a5eeb42;hb=3bd65662b077ee2cbc185bc8f28708b2e1b76a32;hp=dac2755cac22392e5c5ebda12f507f28a60299dc;hpb=bac209eb1d120c27acc1ede8fa7dfef81f3eaaf1;p=rrdtool.git

diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c
index dac2755..2daa5a5 100644
--- a/src/rrd_cgi.c
+++ b/src/rrd_cgi.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2rc3  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.11  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_cgi.c  RRD Web Page Generator
  *****************************************************************************/
@@ -35,7 +35,7 @@ char* cgigetq(long , const char **);
 char* cgigetqp(long , const char **);
 
 /* call rrd_graph and insert appropriate image tag */
-char* drawgraph(long, char **);
+char* drawgraph(long, const char **);
 
 /* return PRINT functions from last rrd_graph call */
 char* drawprint(long, const char **);
@@ -266,6 +266,8 @@ int main(int argc, char *argv[]) {
 #ifdef MUST_DISABLE_FPMASK
 	fpsetmask(0);
 #endif
+        optind = 0; opterr = 0;  /* initialize getopt */
+
 	/* what do we get for cmdline arguments?
 	for (i=0;i<argc;i++)
 	printf("%d-'%s'\n",i,argv[i]); */
@@ -443,7 +445,7 @@ char* rrdgetenv(long argc, const char **args) {
 	if (envvar) {
 		return stralloc(envvar);
 	} else {
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
                _snprintf(buf, sizeof(buf), "[ERROR:_getenv_'%s'_failed", args[0]);
 #else
                 snprintf(buf, sizeof(buf), "[ERROR:_getenv_'%s'_failed", args[0]);
@@ -463,7 +465,7 @@ char* rrdgetvar(long argc, const char **args) {
 	if (value) {
 		return stralloc(value);
 	} else {
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
                _snprintf(buf, sizeof(buf), "[ERROR:_getvar_'%s'_failed", args[0]);
 #else
                 snprintf(buf, sizeof(buf), "[ERROR:_getvar_'%s'_failed", args[0]);
@@ -545,7 +547,7 @@ char* printstrftime(long argc, const char **args){
 char* includefile(long argc, const char **args){
   char *buffer;
   if (argc >= 1) {
-      char* filename = args[0];
+      const char* filename = args[0];
       readfile(filename, &buffer, 0);
       if (rrd_test_error()) {
 	  	char *err = malloc((strlen(rrd_get_error())+DS_NAM_SIZE));
@@ -687,7 +689,7 @@ char* cgiget(long argc, const char **args){
 
 
 
-char* drawgraph(long argc, char **args){
+char* drawgraph(long argc, const char **args){
   int i,xsize, ysize;
   double ymin,ymax;
   for(i=0;i<argc;i++)
@@ -696,10 +698,8 @@ char* drawgraph(long argc, char **args){
     args[argc++] = "--imginfo";
     args[argc++] = "<IMG SRC=\"./%s\" WIDTH=\"%lu\" HEIGHT=\"%lu\">";
   }
-  optind=0; /* reset gnu getopt */
-  opterr=0; /* reset gnu getopt */
   calfree();
-  if( rrd_graph(argc+1, args-1, &calcpr, &xsize, &ysize,NULL,&ymin,&ymax) != -1 ) {
+  if( rrd_graph(argc+1, (char **) args-1, &calcpr, &xsize, &ysize,NULL,&ymin,&ymax) != -1 ) {
     return stralloc(calcpr[0]);
   } else {
     if (rrd_test_error()) {
@@ -732,7 +732,7 @@ char* printtimelast(long argc, const char **args) {
     if (buf == NULL){	
 	return stralloc("[ERROR: allocating strftime buffer]");
     };
-    last = rrd_last(argc+1, args-1); 
+    last = rrd_last(argc+1, (char **) args-1); 
     if (rrd_test_error()) {
       char *err = malloc((strlen(rrd_get_error())+DS_NAM_SIZE)*sizeof(char));
       sprintf(err, "[ERROR: %s]",rrd_get_error());
@@ -981,7 +981,7 @@ parse(
 	if (end)
 	{
 		/* got arguments, call function for 'tag' with arguments */
-		val = func(argc, args);
+		val = func(argc, (const char **) args);
 		free(args);
 	}
 	else