/*****************************************************************************
- * RRDtool 1.3rc8 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
N_
("Valid commands: create, update, updatev, graph, graphv, dump, restore,\n"
"\t\tlast, lastupdate, first, info, fetch, tune,\n"
- "\t\tresize, xport\n\n");
+ "\t\tresize, xport, flush\n\n");
const char *help_listremote =
N_("Valid remote commands: quit, ls, cd, mkdir, pwd\n\n");
const char *help_dump =
N_("* dump - dump an RRD to XML\n\n"
- "\trrdtool dump filename.rrd >filename.xml\n\n");
+ "\trrdtool dump filename.rrd >filename.xml\n"
+ "\t\t[--header|-h {xsd,dtd}]\n\n");
const char *help_info =
N_("* info - returns the configuration and status of the RRD\n\n"
const char *help_update =
N_("* update - update an RRD\n\n"
"\trrdtool update filename\n"
- "\t\t--template|-t ds-name:ds-name:...\n"
+ "\t\t[--template|-t ds-name:ds-name:...]\n"
+ "\t\t[--daemon <address>]\n"
"\t\ttime|N:value[:value...]\n\n"
"\t\tat-time@value[:value...]\n\n"
"\t\t[ time:value[:value...] ..]\n\n");
N_("* updatev - a verbose version of update\n"
"\treturns information about values, RRAs, and datasources updated\n\n"
"\trrdtool updatev filename\n"
- "\t\t--template|-t ds-name:ds-name:...\n"
+ "\t\t[--template|-t ds-name:ds-name:...]\n"
"\t\ttime|N:value[:value...]\n\n"
"\t\tat-time@value[:value...]\n\n"
"\t\t[ time:value[:value...] ..]\n\n");
N_("* fetch - fetch data out of an RRD\n\n"
"\trrdtool fetch filename.rrd CF\n"
"\t\t[-r|--resolution resolution]\n"
- "\t\t[-s|--start start] [-e|--end end]\n\n");
+ "\t\t[-s|--start start] [-e|--end end]\n"
+ "\t\t[--daemon <address>]\n\n");
+
+ const char *help_flush =
+ N_("* flush - flush cached data out to an RRD file\n\n"
+ "\trrdtool flush filename.rrd\n"
+ "\t\t[--daemon <address>]\n\n");
/* break up very large strings (help_graph, help_tune) for ISO C89 compliance*/
"\trrdtool graphv filename [-s|--start seconds] [-e|--end seconds]\n");
const char *help_graph1 =
N_("\t\t[-x|--x-grid x-axis grid and label]\n"
- "\t\t[-Y|--alt-y-grid]\n"
+ "\t\t[-Y|--alt-y-grid] [--full-size-mode]\n"
"\t\t[-y|--y-grid y-axis grid and label]\n"
"\t\t[-v|--vertical-label string] [-w|--width pixels]\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] [--daemon <address>]\n"
"\t\t[-F|--force-rules-legend]\n" "\t\t[-j|--only-graph]\n");
const char *help_graph2 =
N_("\t\t[-n|--font FONTTAG:size:font]\n"
C_LASTUPDATE, C_FIRST, C_UPDATE, C_FETCH, C_GRAPH, C_GRAPHV,
C_TUNE,
C_RESIZE, C_XPORT, C_QUIT, C_LS, C_CD, C_MKDIR, C_PWD,
- C_UPDATEV
+ C_UPDATEV, C_FLUSH
};
int help_cmd = C_NONE;
help_cmd = C_UPDATEV;
else if (!strcmp(cmd, "fetch"))
help_cmd = C_FETCH;
+ else if (!strcmp(cmd, "flush"))
+ help_cmd = C_FLUSH;
else if (!strcmp(cmd, "graph"))
help_cmd = C_GRAPH;
else if (!strcmp(cmd, "graphv"))
case C_FETCH:
fputs(_(help_fetch), stdout);
break;
+ case C_FLUSH:
+ fputs(_(help_flush), stdout);
+ break;
case C_GRAPH:
fputs(_(help_graph0), stdout);
fputs(_(help_graph1), stdout);
return *aLinePtr = linebuf;
bufsize += MAX_LENGTH;
if (!(linebuf = realloc(linebuf, bufsize))) {
+ free(linebuf);
perror("fgetslong: realloc");
exit(1);
}
}
- return *aLinePtr = linebuf[0] ? linebuf : 0;
+ if (linebuf[0]){
+ return *aLinePtr = linebuf;
+ }
+ free(linebuf);
+ return *aLinePtr = 0;
}
int main(
== 0) {
#ifdef HAVE_CHROOT
- chroot(argv[2]);
- if (errno != 0) {
- fprintf(stderr,
- "ERROR: can't change root to '%s' errno=%d\n",
- argv[2], errno);
+ if (chroot(argv[2]) != 0){
+ fprintf(stderr, "ERROR: chroot %s: %s\n", argv[2],rrd_strerror(errno));
exit(errno);
}
ChangeRoot = 1;
}
}
if (strcmp(firstdir, "")) {
- chdir(firstdir);
- if (errno != 0) {
- fprintf(stderr, "ERROR: %s\n", rrd_strerror(errno));
+ if (chdir(firstdir) != 0){
+ fprintf(stderr, "ERROR: chdir %s %s\n", firstdir,rrd_strerror(errno));
exit(errno);
}
}
while (fgetslong(&aLine, stdin)) {
if ((argc = CountArgs(aLine)) == 0) {
+ free(aLine);
printf("ERROR: not enough arguments\n");
}
if ((myargv = (char **) malloc((argc + 1) *
exit(1);
}
if ((argc = CreateArgs(argv[0], aLine, argc, myargv)) < 0) {
+ free(aLine);
+ free(myargv);
printf("ERROR: creating arguments\n");
} else {
int ret = HandleInputLine(argc, myargv, stdout);
/* Reset errno to 0 before we start.
*/
- errno = 0;
if (RemoteMode) {
if (argc > 1 && strcmp("quit", argv[1]) == 0) {
if (argc > 2) {
return (1);
}
#endif
- chdir(argv[2]);
- if (errno != 0) {
- printf("ERROR: %s\n", rrd_strerror(errno));
+ if (chdir(argv[2]) != 0){
+ printf("ERROR: chdir %s %s\n", argv[2], rrd_strerror(errno));
return (1);
}
return (0);
}
cwd = getcwd(NULL, MAXPATH);
if (cwd == NULL) {
- printf("ERROR: %s\n", rrd_strerror(errno));
+ printf("ERROR: getcwd %s\n", rrd_strerror(errno));
return (1);
}
printf("%s\n", cwd);
return (1);
}
#endif
- mkdir(argv[2], 0777);
- if (errno != 0) {
- printf("ERROR: %s\n", rrd_strerror(errno));
+ if(mkdir(argv[2], 0777)!=0){
+ printf("ERROR: mkdir %s: %s\n", argv[2],rrd_strerror(errno));
return (1);
}
return (0);
}
closedir(curdir);
} else {
- printf("ERROR: %s\n", rrd_strerror(errno));
+ printf("ERROR: opendir .: %s\n", rrd_strerror(errno));
return (errno);
}
return (0);
else if (strcmp("last", argv[1]) == 0)
printf("%ld\n", rrd_last(argc - 1, &argv[1]));
else if (strcmp("lastupdate", argv[1]) == 0) {
- time_t last_update;
- char **ds_namv;
- char **last_ds;
- unsigned long ds_cnt, i;
-
- if (rrd_lastupdate(argc - 1, &argv[1], &last_update,
- &ds_cnt, &ds_namv, &last_ds) == 0) {
- for (i = 0; i < ds_cnt; i++)
- printf(" %s", ds_namv[i]);
- printf("\n\n");
- printf("%10lu:", last_update);
- for (i = 0; i < ds_cnt; i++) {
- printf(" %s", last_ds[i]);
- free(last_ds[i]);
- free(ds_namv[i]);
- }
- printf("\n");
- free(last_ds);
- free(ds_namv);
- }
+ rrd_lastupdate(argc - 1, &argv[1]);
} else if (strcmp("first", argv[1]) == 0)
printf("%ld\n", rrd_first(argc - 1, &argv[1]));
else if (strcmp("update", argv[1]) == 0)
}
} else if (strcmp("graphv", argv[1]) == 0) {
- rrd_info_t *grinfo = NULL; /* 1 to distinguish it from the NULL that rrd_graph sends in */
+ 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]);
if (grinfo) {
} else if (strcmp("tune", argv[1]) == 0)
rrd_tune(argc - 1, &argv[1]);
+ else if (strcmp("flush", argv[1]) == 0)
+ rrd_cmd_flush(argc - 1, &argv[1]);
else {
rrd_set_error("unknown function '%s'", argv[1]);
}
projects / rrdtool.git / blobdiff