X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.c;h=b64a7038966a1c35ac245b5f64b5e5d4f3b944fc;hp=784f6dc4a3918ee39f9286044551c6e7244bc057;hb=01fe4f849e596ca0ea17d7454908091d5c9d7bab;hpb=3afb4a0f24aca310f4ceadcd8956380746179f88 diff --git a/src/rrd_tool.c b/src/rrd_tool.c index 784f6dc..b64a703 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2rc6 Copyright by Tobi Oetiker, 1997-2005 + * RRDtool 1.2.3 Copyright by Tobi Oetiker, 1997-2005 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ @@ -22,7 +22,7 @@ void PrintUsage(char *cmd) { char help_main[] = - "RRDtool 1.2rc6 Copyright 1997-2005 by Tobias Oetiker \n" + "RRDtool 1.2.3 Copyright 1997-2005 by Tobias Oetiker \n" #if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) " Compiled " __DATE__ " " __TIME__ "\n\n" #else @@ -85,8 +85,8 @@ void PrintUsage(char *cmd) char help_fetch[] = "* fetch - fetch data out of an RRD\n\n" "\trrdtool fetch filename.rrd CF\n" - "\t\t[--resolution|-r resolution]\n" - "\t\t[--start|-s start] [--end|-e end]\n\n"; + "\t\t[-r|--resolution resolution]\n" + "\t\t[-s|--start start] [-e|--end end]\n\n"; /* break up very large strings (help_graph, help_tune) for ISO C89 compliance*/ @@ -94,40 +94,46 @@ void PrintUsage(char *cmd) "* graph - generate a graph from one or several RRD\n\n" "\trrdtool graph filename [-s|--start seconds] [-e|--end seconds]\n" "\t\t[-x|--x-grid x-axis grid and label]\n" - "\t\t[--alt-y-grid]\n" + "\t\t[-Y|--alt-y-grid]\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[-F|--force-rules-legend]\n"; + "\t\t[-F|--force-rules-legend]\n" + "\t\t[-j|--only-graph]\n"; char help_graph2[] = - "\t\t[-j|--only-graph]\n" - "\t\t[--font FONTTAG:size:font]\n" - "\t\t[--zoom factor]\n" - "\t\t[--alt-autoscale]\n" - "\t\t[--alt-autoscale-max]\n" - "\t\t[--no-gridfit]\n" - "\t\t[--units-exponent value]\n" - "\t\t[--units-length value]\n" - "\t\t[--step seconds]\n" + "\t\t[-n|--font FONTTAG:size:font]\n" + "\t\t[-m|--zoom factor]\n" + "\t\t[-A|--alt-autoscale]\n" + "\t\t[-M|--alt-autoscale-max]\n" + "\t\t[-R|--font-render-mode {normal,light,mono}]\n" + "\t\t[-B|--font-smoothing-threshold size]\n" + "\t\t[-E|--slope-mode]\n" + "\t\t[-N|--no-gridfit]\n" + "\t\t[-X|--units-exponent value]\n" + "\t\t[-L|--units-length value]\n" + "\t\t[-S|--step seconds]\n" "\t\t[-f|--imginfo printfstr]\n" "\t\t[-a|--imgformat PNG]\n" - "\t\t[-c|--color COLORTAG#rrggbb[aa]] [-t|--title string]\n"; - char help_graph3[] = + "\t\t[-c|--color COLORTAG#rrggbb[aa]] [-t|--title string]\n" "\t\t[DEF:vname=rrd:ds-name:CF]\n" - "\t\t[CDEF:vname=rpn-expression]\n" + "\t\t[CDEF:vname=rpn-expression]\n"; + char help_graph3[] = "\t\t[VDEF:vdefname=rpn-expression]\n" - "\t\t[PRINT:vname:CF:format]\n" - "\t\t[GPRINT:vname:CF:format]\n" "\t\t[PRINT:vdefname:format]\n" "\t\t[GPRINT:vdefname:format]\n" + "\t\t[COMMENT:text]\n" + "\t\t[SHIFT:vname:offset]\n" + "\t\t[TICK:vname#rrggbb[aa][:[fraction][:legend]]]\n" "\t\t[HRULE:value#rrggbb[aa][:legend]]\n" "\t\t[VRULE:value#rrggbb[aa][:legend]]\n" - "\t\t[LINE{1|2|3}:vname[#rrggbb[aa][:legend]][:STACK]]\n" - "\t\t[AREA:vname[#rrggbb[aa][:legend]][:STACK]]\n" - "\t\t[STACK:vname[#rrggbb[aa][:legend]]]\n\n"; + "\t\t[LINE[width]:vname[#rrggbb[aa][:[legend][:STACK]]]]\n" + "\t\t[AREA:vname[#rrggbb[aa][:[legend][:STACK]]]]\n" + "\t\t[PRINT:vname:CF:format] (deprecated)\n" + "\t\t[GPRINT:vname:CF:format] (deprecated)\n" + "\t\t[STACK:vname[#rrggbb[aa][:legend]]] (deprecated)\n\n"; char help_tune1[] = " * tune - Modify some basic properties of an RRD\n\n" @@ -356,7 +362,7 @@ int main(int argc, char *argv[]) while (fgets(aLine, sizeof(aLine)-1, stdin)){ if ((argc = CountArgs(aLine)) == 0) { - fprintf(stderr,"ERROR: not enough arguments\n"); + fprintf(stderr,"ERROR: not enough arguments\n"); } if ((myargv = (char **) malloc((argc+1) * sizeof(char *))) == NULL) { @@ -368,8 +374,7 @@ int main(int argc, char *argv[]) exit(1); } - if (HandleInputLine(argc, myargv, stdout)) - exit(1); + HandleInputLine(argc, myargv, stdout); free(myargv); #if HAVE_GETRUSAGE @@ -416,8 +421,6 @@ int HandleInputLine(int argc, char **argv, FILE* out) #if defined(HAVE_SYS_STAT_H) struct stat st; #endif - optind=0; /* reset gnu getopt */ - opterr=0; /* no error messages */ if (RemoteMode){ if (argc>1 && strcmp("quit", argv[1]) == 0){ @@ -549,7 +552,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) strcmp("v", argv[1]) == 0 || strcmp("-v", argv[1]) == 0 || strcmp("-version", argv[1]) == 0 ) - printf("RRDtool 1.2rc6 Copyright by Tobi Oetiker, 1997-2005\n"); + printf("RRDtool 1.2.3 Copyright by Tobi Oetiker, 1997-2005\n"); else if (strcmp("restore", argv[1]) == 0) rrd_restore(argc-1, &argv[1]); else if (strcmp("resize", argv[1]) == 0) @@ -583,13 +586,12 @@ int HandleInputLine(int argc, char **argv, FILE* out) free (data); } } else if (strcmp("xport", argv[1]) == 0) { - int xxsize; unsigned long int j = 0; time_t start,end, ti; unsigned long step, col_cnt,row_cnt; rrd_value_t *data,*ptr; char **legend_v; - if(rrd_xport(argc-1, &argv[1], &xxsize,&start,&end,&step,&col_cnt,&legend_v,&data) != -1) { + if(rrd_xport(argc-1, &argv[1], &start,&end,&step,&col_cnt,&legend_v,&data) != -1) { row_cnt = (end-start)/step; ptr = data; printf("\n\n", XML_ENCODING);