projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the first TREND* value can be calculated earlier ... -- fredrick (fix for #312)
[rrdtool.git]
/
src
/
rrd_tool.c
diff --git
a/src/rrd_tool.c
b/src/rrd_tool.c
index
d860abe
..
0748d92
100644
(file)
--- a/
src/rrd_tool.c
+++ b/
src/rrd_tool.c
@@
-8,6
+8,8
@@
#include "../win32/config.h"
#include <stdlib.h>
#include <sys/stat.h>
#include "../win32/config.h"
#include <stdlib.h>
#include <sys/stat.h>
+#include <io.h>
+#include <fcntl.h>
#else
#ifdef HAVE_CONFIG_H
#include "../rrd_config.h"
#else
#ifdef HAVE_CONFIG_H
#include "../rrd_config.h"
@@
-414,6
+416,12
@@
int main(
according to localeconv(3) */
setlocale(LC_ALL, "");
according to localeconv(3) */
setlocale(LC_ALL, "");
+#ifdef WIN32 && !defined(__CYGWIN__)
+ setmode(fileno(stdout), O_BINARY);
+ setmode(fileno(stdin), O_BINARY);
+#endif
+
+
#if defined(HAVE_LIBINTL_H) && defined(BUILD_LIBINTL)
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
textdomain(GETTEXT_PACKAGE);
#if defined(HAVE_LIBINTL_H) && defined(BUILD_LIBINTL)
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
textdomain(GETTEXT_PACKAGE);
@@
-534,7
+542,7
@@
int HandleInputLine(
*/
if (RemoteMode) {
if (argc > 1 && strcmp("quit", argv[1]) == 0) {
*/
if (RemoteMode) {
if (argc > 1 && strcmp("quit", argv[1]) == 0) {
- if (argc
>
2) {
+ if (argc
!=
2) {
printf("ERROR: invalid parameter count for quit\n");
return (1);
}
printf("ERROR: invalid parameter count for quit\n");
return (1);
}
@@
-542,7
+550,7
@@
int HandleInputLine(
}
#if defined(HAVE_OPENDIR) && defined(HAVE_READDIR) && defined(HAVE_CHDIR)
if (argc > 1 && strcmp("cd", argv[1]) == 0) {
}
#if defined(HAVE_OPENDIR) && defined(HAVE_READDIR) && defined(HAVE_CHDIR)
if (argc > 1 && strcmp("cd", argv[1]) == 0) {
- if (argc
>
3) {
+ if (argc
!=
3) {
printf("ERROR: invalid parameter count for cd\n");
return (1);
}
printf("ERROR: invalid parameter count for cd\n");
return (1);
}
@@
-562,7
+570,7
@@
int HandleInputLine(
}
if (argc > 1 && strcmp("pwd", argv[1]) == 0) {
char *cwd; /* To hold current working dir on call to pwd */
}
if (argc > 1 && strcmp("pwd", argv[1]) == 0) {
char *cwd; /* To hold current working dir on call to pwd */
- if (argc
>
2) {
+ if (argc
!=
2) {
printf("ERROR: invalid parameter count for pwd\n");
return (1);
}
printf("ERROR: invalid parameter count for pwd\n");
return (1);
}
@@
-576,7
+584,7
@@
int HandleInputLine(
return (0);
}
if (argc > 1 && strcmp("mkdir", argv[1]) == 0) {
return (0);
}
if (argc > 1 && strcmp("mkdir", argv[1]) == 0) {
- if (argc
>
3) {
+ if (argc
!=
3) {
printf("ERROR: invalid parameter count for mkdir\n");
return (1);
}
printf("ERROR: invalid parameter count for mkdir\n");
return (1);
}
@@
-595,7
+603,7
@@
int HandleInputLine(
return (0);
}
if (argc > 1 && strcmp("ls", argv[1]) == 0) {
return (0);
}
if (argc > 1 && strcmp("ls", argv[1]) == 0) {
- if (argc
>
2) {
+ if (argc
!=
2) {
printf("ERROR: invalid parameter count for ls\n");
return (1);
}
printf("ERROR: invalid parameter count for ls\n");
return (1);
}
@@
-695,6
+703,7
@@
int HandleInputLine(
free(data);
}
} else if (strcmp("xport", argv[1]) == 0) {
free(data);
}
} else if (strcmp("xport", argv[1]) == 0) {
+#ifdef HAVE_RRD_GRAPH
int xxsize;
unsigned long int j = 0;
time_t start, end, ti;
int xxsize;
unsigned long int j = 0;
time_t start, end, ti;
@@
-714,7
+723,8
@@
int HandleInputLine(
if (rrd_xport
(argc - 1, &argv[1], &xxsize, &start, &end, &step, &col_cnt,
&legend_v, &data) != -1) {
if (rrd_xport
(argc - 1, &argv[1], &xxsize, &start, &end, &step, &col_cnt,
&legend_v, &data) != -1) {
- char *old_locale = setlocale(LC_NUMERIC, "C");
+ char *old_locale = setlocale(LC_NUMERIC,NULL);
+ setlocale(LC_NUMERIC, "C");
row_cnt = (end - start) / step;
ptr = data;
printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n\n",
row_cnt = (end - start) / step;
ptr = data;
printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n\n",
@@
-770,7
+780,11
@@
int HandleInputLine(
setlocale(LC_NUMERIC, old_locale);
}
free(vtag);
setlocale(LC_NUMERIC, old_locale);
}
free(vtag);
+#else
+ rrd_set_error("the instance of rrdtool has been compiled without graphics");
+#endif
} else if (strcmp("graph", argv[1]) == 0) {
} else if (strcmp("graph", argv[1]) == 0) {
+#ifdef HAVE_RRD_GRAPH
char **calcpr;
#ifdef notused /*XXX*/
char **calcpr;
#ifdef notused /*XXX*/
@@
-804,7
+818,11
@@
int HandleInputLine(
}
}
}
}
+#else
+ rrd_set_error("the instance of rrdtool has been compiled without graphics");
+#endif
} else if (strcmp("graphv", argv[1]) == 0) {
} else if (strcmp("graphv", argv[1]) == 0) {
+#ifdef HAVE_RRD_GRAPH
rrd_info_t *grinfo = NULL; /* 1 to distinguish it from the NULL that rrd_graph sends in */
grinfo = rrd_graph_v(argc - 1, &argv[1]);
rrd_info_t *grinfo = NULL; /* 1 to distinguish it from the NULL that rrd_graph sends in */
grinfo = rrd_graph_v(argc - 1, &argv[1]);
@@
-812,11
+830,15
@@
int HandleInputLine(
rrd_info_print(grinfo);
rrd_info_free(grinfo);
}
rrd_info_print(grinfo);
rrd_info_free(grinfo);
}
-
+#else
+ rrd_set_error("the instance of rrdtool has been compiled without graphics");
+#endif
} else if (strcmp("tune", argv[1]) == 0)
rrd_tune(argc - 1, &argv[1]);
} else if (strcmp("tune", argv[1]) == 0)
rrd_tune(argc - 1, &argv[1]);
+#ifndef WIN32
else if (strcmp("flushcached", argv[1]) == 0)
rrd_flushcached(argc - 1, &argv[1]);
else if (strcmp("flushcached", argv[1]) == 0)
rrd_flushcached(argc - 1, &argv[1]);
+#endif
else {
rrd_set_error("unknown function '%s'", argv[1]);
}
else {
rrd_set_error("unknown function '%s'", argv[1]);
}