X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_cgi.c;h=a734fef91e8e9c3fdefce5a7b76ab92dea7907a5;hb=361a0fd38d7adf95847508f54c0bde9b3f98662e;hp=411b02bb23f75bafa0324a5379d26a5601c41dae;hpb=06c64aacf29db1bbf135e80aa98ec03ec8c6719c;p=rrdtool.git

diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c
index 411b02b..a734fef 100644
--- a/src/rrd_cgi.c
+++ b/src/rrd_cgi.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2004
+ * RRDtool 1.2.8  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_cgi.c  RRD Web Page Generator
  *****************************************************************************/
@@ -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]); */
@@ -392,6 +394,7 @@ char* rrdsetenv(long argc, const char **args) {
 			free(xyz);
 			return stralloc("[ERROR: failed to do putenv]");
 		};
+ 	        return stralloc("");
 	}
 	return stralloc("[ERROR: setenv failed because not enough "
 		  			"arguments were defined]");
@@ -442,7 +445,7 @@ char* rrdgetenv(long argc, const char **args) {
 	if (envvar) {
 		return stralloc(envvar);
 	} else {
-#ifdef WIN32
+#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]);
@@ -462,7 +465,7 @@ char* rrdgetvar(long argc, const char **args) {
 	if (value) {
 		return stralloc(value);
 	} else {
-#ifdef WIN32
+#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]);
@@ -688,16 +691,15 @@ char* cgiget(long argc, const char **args){
 
 char* drawgraph(long argc, char **args){
   int i,xsize, ysize;
+  double ymin,ymax;
   for(i=0;i<argc;i++)
     if(strcmp(args[i],"--imginfo")==0 || strcmp(args[i],"-g")==0) break;
   if(i==argc) {
     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) != -1 ) {
+  if( rrd_graph(argc+1, args-1, &calcpr, &xsize, &ysize,NULL,&ymin,&ymax) != -1 ) {
     return stralloc(calcpr[0]);
   } else {
     if (rrd_test_error()) {