X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.c;h=e2bd1db381387cf5317555aa1b175935a77a0d1e;hp=6892ac57ffb926b12b536bfe0dd7b299bef23c09;hb=c112f7c06e534ce7a5a4e25b6f7f742aeb051850;hpb=61a736a2e1ad057f78cb5c2245207c9d02d86f29 diff --git a/src/rrd_tool.c b/src/rrd_tool.c index 6892ac5..e2bd1db 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2004 + * RRDtool 1.2rc3 Copyright by Tobi Oetiker, 1997-2005 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ @@ -22,7 +22,7 @@ void PrintUsage(char *cmd) { char help_main[] = - "RRDtool 1.1.x Copyright 1997-2004 by Tobias Oetiker \n" + "RRDtool 1.2rc3 Copyright 1997-2005 by Tobias Oetiker \n" #ifndef WIN32 " Compiled " MAKE_TIMESTAMP "\n\n" #else @@ -32,7 +32,7 @@ void PrintUsage(char *cmd) char help_list[] = "Valid commands: create, update, updatev, graph, dump, restore,\n" - "\t\tlast, info, fetch, tune, resize, xport\n\n"; + "\t\tlast, first, info, fetch, tune, resize, xport\n\n"; char help_listremote[] = "Valid remote commands: quit, ls, cd, mkdir\n\n"; @@ -61,6 +61,10 @@ void PrintUsage(char *cmd) "* last - show last update time for RRD\n\n" "\trrdtool last filename.rrd\n\n"; + char help_first[] = + "* first - show first update time for RRA within an RRD\n\n" + "\trrdtool first filename.rrd [--rraindex number]\n\n"; + char help_update[] = "* update - update an RRD\n\n" "\trrdtool update filename\n" @@ -84,7 +88,9 @@ void PrintUsage(char *cmd) "\t\t[--resolution|-r resolution]\n" "\t\t[--start|-s start] [--end|-e end]\n\n"; - char help_graph[] = +/* break up very large strings (help_graph, help_tune) for ISO C89 compliance*/ + + char help_graph1[] = "* 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" @@ -95,6 +101,8 @@ void PrintUsage(char *cmd) "\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"; + char help_graph2[] = "\t\t[-j|--only-graph]\n" "\t\t[--font FONTTAG:size:font]\n" "\t\t[--zoom factor]\n" @@ -104,7 +112,8 @@ void PrintUsage(char *cmd) "\t\t[--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" + "\t\t[-c|--color COLORTAG#rrggbb[aa]] [-t|--title string]\n"; + char help_graph3[] = "\t\t[DEF:vname=rrd:ds-name:CF]\n" "\t\t[CDEF:vname=rpn-expression]\n" "\t\t[PRINT:vname:CF:format]\n" @@ -115,7 +124,7 @@ void PrintUsage(char *cmd) "\t\t[AREA:vname[#rrggbb[aa][:legend]]]\n" "\t\t[STACK:vname[#rrggbb[aa][:legend]]]\n\n"; - char help_tune[] = + char help_tune1[] = " * tune - Modify some basic properties of an RRD\n\n" "\trrdtool tune filename\n" "\t\t[--heartbeat|-h ds-name:heartbeat]\n" @@ -125,7 +134,9 @@ void PrintUsage(char *cmd) "\t\t[--deltapos scale-value] [--deltaneg scale-value]\n" "\t\t[--failure-threshold integer]\n" "\t\t[--window-length integer]\n" - "\t\t[--alpha adaptation-parameter]\n" + "\t\t[--alpha adaptation-parameter]\n"; + char help_tune2[] = + " * tune - Modify some basic properties of an RRD\n\n" "\t\t[--beta adaptation-parameter]\n" "\t\t[--gamma adaptation-parameter]\n" "\t\t[--gamma-deviation adaptation-parameter]\n" @@ -166,7 +177,7 @@ void PrintUsage(char *cmd) "For more information read the RRD manpages\n\n"; - enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST, + enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST, C_FIRST, C_UPDATE, C_FETCH, C_GRAPH, C_TUNE, C_RESIZE, C_XPORT, C_QUIT, C_LS, C_CD, C_MKDIR, C_UPDATEV }; @@ -184,6 +195,8 @@ void PrintUsage(char *cmd) help_cmd = C_RESTORE; else if (!strcmp(cmd,"last")) help_cmd = C_LAST; + else if (!strcmp(cmd,"first")) + help_cmd = C_FIRST; else if (!strcmp(cmd,"update")) help_cmd = C_UPDATE; else if (!strcmp(cmd,"updatev")) @@ -231,6 +244,9 @@ void PrintUsage(char *cmd) case C_LAST: fputs(help_last, stdout); break; + case C_FIRST: + fputs(help_first, stdout); + break; case C_UPDATE: fputs(help_update, stdout); break; @@ -241,10 +257,13 @@ void PrintUsage(char *cmd) fputs(help_fetch, stdout); break; case C_GRAPH: - fputs(help_graph, stdout); + fputs(help_graph1, stdout); + fputs(help_graph2, stdout); + fputs(help_graph3, stdout); break; case C_TUNE: - fputs(help_tune, stdout); + fputs(help_tune1, stdout); + fputs(help_tune2, stdout); break; case C_RESIZE: fputs(help_resize, stdout); @@ -320,7 +339,7 @@ int main(int argc, char *argv[]) if (strcmp(firstdir,"")){ chdir(firstdir); if (errno!=0){ - fprintf(stderr,"ERROR: %s\n",strerror(errno)); + fprintf(stderr,"ERROR: %s\n",rrd_strerror(errno)); exit(errno); } } @@ -375,8 +394,11 @@ int main(int argc, char *argv[]) PrintUsage(argv[2]); exit(0); } - else - HandleInputLine(argc, argv, stderr); + else { + if(HandleInputLine(argc, argv, stderr)) { + return 1; + } + } return 0; } @@ -417,7 +439,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) #endif chdir(argv[2]); if (errno!=0){ - printf("ERROR: %s\n",strerror(errno)); + printf("ERROR: %s\n",rrd_strerror(errno)); } return(0); } @@ -435,7 +457,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) #endif mkdir(argv[2],0777); if (errno!=0){ - printf("ERROR: %s\n",strerror(errno)); + printf("ERROR: %s\n",rrd_strerror(errno)); } return(0); } @@ -460,7 +482,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) } } else{ - printf("ERROR: %s\n",strerror(errno)); + printf("ERROR: %s\n",rrd_strerror(errno)); return(errno); } return(0); @@ -524,13 +546,15 @@ 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.1.x Copyright (C) 1997-2004 by Tobias Oetiker \n"); + printf("RRDtool 1.2rc3 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) rrd_resize(argc-1, &argv[1]); else if (strcmp("last", argv[1]) == 0) printf("%ld\n",rrd_last(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) rrd_update(argc-1, &argv[1]); else if (strcmp("fetch", argv[1]) == 0) { @@ -606,11 +630,14 @@ int HandleInputLine(int argc, char **argv, FILE* out) } else if (strcmp("graph", argv[1]) == 0) { char **calcpr; +#ifdef notused /*XXX*/ const char *imgfile = argv[2]; /* rrd_graph changes argv pointer */ +#endif int xsize, ysize; + double ymin,ymax; int i; int tostdout = (strcmp(argv[2],"-") == 0); - if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL) != -1 ) { + if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL, &ymin, &ymax) != -1 ) { if (!tostdout) printf ("%dx%d\n",xsize,ysize); if (calcpr) { @@ -631,6 +658,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) if (rrd_test_error()) { fprintf(out, "ERROR: %s\n",rrd_get_error()); rrd_clear_error(); + return 1; } return(0); }