projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed segmentation falt problem in rrd_tool -- Yasuhiro Sumi <yasuhiro.sumi@hde.co.jp>
[rrdtool.git]
/
src
/
rrd_tool.c
diff --git
a/src/rrd_tool.c
b/src/rrd_tool.c
index
6aa53cc
..
fce0925
100644
(file)
--- a/
src/rrd_tool.c
+++ b/
src/rrd_tool.c
@@
-96,7
+96,8
@@
void PrintUsage(char *cmd)
"\t\t[-h|--height pixels] [-o|--logarithmic]\n"
"\t\t[-u|--upper-limit value] [-z|--lazy]\n"
"\t\t[-l|--lower-limit value] [-r|--rigid]\n"
"\t\t[-h|--height pixels] [-o|--logarithmic]\n"
"\t\t[-u|--upper-limit value] [-z|--lazy]\n"
"\t\t[-l|--lower-limit value] [-r|--rigid]\n"
- "\t\t[-g|--no-legend]\n";
+ "\t\t[-g|--no-legend]\n"
+ "\t\t[-F|--force-rules-legend]\n";
char help_graph2[] =
"\t\t[-j|--only-graph]\n"
"\t\t[--font FONTTAG:size:font]\n"
char help_graph2[] =
"\t\t[-j|--only-graph]\n"
"\t\t[--font FONTTAG:size:font]\n"
@@
-384,8
+385,11
@@
int main(int argc, char *argv[])
PrintUsage(argv[2]);
exit(0);
}
PrintUsage(argv[2]);
exit(0);
}
- else
- HandleInputLine(argc, argv, stderr);
+ else {
+ if(HandleInputLine(argc, argv, stderr)) {
+ return 1;
+ }
+ }
return 0;
}
return 0;
}
@@
-539,7
+543,7
@@
int HandleInputLine(int argc, char **argv, FILE* out)
else if (strcmp("resize", argv[1]) == 0)
rrd_resize(argc-1, &argv[1]);
else if (strcmp("last", argv[1]) == 0)
else if (strcmp("resize", argv[1]) == 0)
rrd_resize(argc-1, &argv[1]);
else if (strcmp("last", argv[1]) == 0)
- printf("%ld\n",rrd_last(argc-1, argv[1]));
+ printf("%ld\n",rrd_last(argc-1,
&
argv[1]));
else if (strcmp("update", argv[1]) == 0)
rrd_update(argc-1, &argv[1]);
else if (strcmp("fetch", argv[1]) == 0) {
else if (strcmp("update", argv[1]) == 0)
rrd_update(argc-1, &argv[1]);
else if (strcmp("fetch", argv[1]) == 0) {
@@
-642,6
+646,7
@@
int HandleInputLine(int argc, char **argv, FILE* out)
if (rrd_test_error()) {
fprintf(out, "ERROR: %s\n",rrd_get_error());
rrd_clear_error();
if (rrd_test_error()) {
fprintf(out, "ERROR: %s\n",rrd_get_error());
rrd_clear_error();
+ return 1;
}
return(0);
}
}
return(0);
}