projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prepare for the release of rrdtool-1.2.7
[rrdtool.git]
/
src
/
rrd_cgi.c
diff --git
a/src/rrd_cgi.c
b/src/rrd_cgi.c
index
236ef0d
..
6a928bd
100644
(file)
--- a/
src/rrd_cgi.c
+++ b/
src/rrd_cgi.c
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.2
rc2
Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2
.7
Copyright by Tobi Oetiker, 1997-2005
*****************************************************************************
* rrd_cgi.c RRD Web Page Generator
*****************************************************************************/
*****************************************************************************
* rrd_cgi.c RRD Web Page Generator
*****************************************************************************/
@@
-266,6
+266,8
@@
int main(int argc, char *argv[]) {
#ifdef MUST_DISABLE_FPMASK
fpsetmask(0);
#endif
#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]); */
/* 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 (envvar) {
return stralloc(envvar);
} else {
-#if
def 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]);
_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 (value) {
return stralloc(value);
} else {
-#if
def 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]);
_snprintf(buf, sizeof(buf), "[ERROR:_getvar_'%s'_failed", args[0]);
#else
snprintf(buf, sizeof(buf), "[ERROR:_getvar_'%s'_failed", args[0]);
@@
-696,8
+698,6
@@
char* drawgraph(long argc, char **args){
args[argc++] = "--imginfo";
args[argc++] = "<IMG SRC=\"./%s\" WIDTH=\"%lu\" HEIGHT=\"%lu\">";
}
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 ) {
return stralloc(calcpr[0]);
calfree();
if( rrd_graph(argc+1, args-1, &calcpr, &xsize, &ysize,NULL,&ymin,&ymax) != -1 ) {
return stralloc(calcpr[0]);