projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rrdcached: Fix permissions of the default socket.
[rrdtool.git]
/
src
/
rrd_tool.c
diff --git
a/src/rrd_tool.c
b/src/rrd_tool.c
index
d860abe
..
cc2aede
100644
(file)
--- a/
src/rrd_tool.c
+++ b/
src/rrd_tool.c
@@
-534,7
+534,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
+542,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
+562,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
+576,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
+595,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);
}
@@
-714,7
+714,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",
@@
-815,8
+816,10
@@
int HandleInputLine(
} 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]);
}