X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.c;h=f0a889f24c69a08090730a197af197120b983303;hp=1795c8458d6934b70a406b40b8c5850567c61c91;hb=7f4dd5f9c0f20e4d6690685641a9cd8ea621da51;hpb=b48f8f963467ce3e608e286c6dff08b54e05bcef diff --git a/src/rrd_tool.c b/src/rrd_tool.c index 1795c84..f0a889f 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002 + * RRDtool 1.2.20 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ @@ -22,16 +22,17 @@ void PrintUsage(char *cmd) { char help_main[] = - "RRDtool 1.1.x Copyright 1997-2003 by Tobias Oetiker \n" - " Compiled " MAKE_TIMESTAMP "\n\n" + "RRDtool " PACKAGE_VERSION " Copyright 1997-2007 by Tobias Oetiker \n" + " Compiled " __DATE__ " " __TIME__ "\n\n" "Usage: rrdtool [options] command command_options\n\n"; char help_list[] = - "Valid commands: create, update, graph, dump, restore,\n" - "\t\tlast, info, fetch, tune, resize, xport\n\n"; + "Valid commands: create, update, updatev, graph, dump, restore,\n" + "\t\tlast, lastupdate, first, info, fetch, tune,\n" + "\t\tresize, xport\n\n"; char help_listremote[] = - "Valid remote commands: quit, ls, cd, mkdir\n\n"; + "Valid remote commands: quit, ls, cd, mkdir, pwd\n\n"; char help_create[] = @@ -51,12 +52,21 @@ void PrintUsage(char *cmd) char help_restore[] = "* restore - restore an RRD file from its XML form\n\n" - "\trrdtool restore [--range-check|-r] filename.xml filename.rrd\n\n"; + "\trrdtool restore [--range-check|-r] [--force-overwrite|-f] filename.xml filename.rrd\n\n"; char help_last[] = "* last - show last update time for RRD\n\n" "\trrdtool last filename.rrd\n\n"; + char help_lastupdate[] = + "* lastupdate - returns the most recent datum stored for\n" + " each DS in an RRD\n\n" + "\trrdtool lastupdate 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" @@ -64,44 +74,71 @@ void PrintUsage(char *cmd) "\t\ttime|N:value[:value...]\n\n" "\t\tat-time@value[:value...]\n\n" "\t\t[ time:value[:value...] ..]\n\n"; - + + char help_updatev[] = + "* 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\ttime|N:value[:value...]\n\n" + "\t\tat-time@value[:value...]\n\n" + "\t\t[ time:value[:value...] ..]\n\n"; + 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*/ - char help_graph[] = + 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" - "\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[--font FONTTAG:size:font]\n" - "\t\t[--zoom factor]\n" - "\t\t[--alt-autoscale]\n" - "\t\t[--alt-autoscale-max]\n" - "\t\t[--units-exponent value]\n" - "\t\t[--step seconds]\n" + "\t\t[-F|--force-rules-legend]\n" + "\t\t[-j|--only-graph]\n"; + char help_graph2[] = + "\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" - "\t\t[DEF:vname=rrd:ds-name:CF]\n" + "\t\t[-W|--watermark string]\n" + "\t\t[DEF:vname=rrd:ds-name:CF]\n"; + char help_graph3[] = "\t\t[CDEF:vname=rpn-expression]\n" - "\t\t[PRINT:vname:CF:format]\n" - "\t\t[GPRINT:vname:CF:format]\n" + "\t\t[VDEF:vdefname=rpn-expression]\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]]]\n" - "\t\t[AREA:vname[#rrggbb[aa][:legend]]]\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_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" @@ -111,14 +148,16 @@ 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" "\t\t[--aberrant-reset ds-name]\n\n"; char help_resize[] = - " * resize - alter the lenght of one of the RRAs in an RRD\n\n" + " * resize - alter the length of one of the RRAs in an RRD\n\n" "\trrdtool resize filename rranum GROW|SHRINK rows\n\n"; char help_xport[] = @@ -126,12 +165,13 @@ void PrintUsage(char *cmd) "\trrdtool xport [-s|--start seconds] [-e|--end seconds]\n" "\t\t[-m|--maxrows rows]\n" "\t\t[--step seconds]\n" + "\t\t[--enumds]\n" "\t\t[DEF:vname=rrd:ds-name:CF]\n" "\t\t[CDEF:vname=rpn-expression]\n" "\t\t[XPORT:vname:legend]\n\n"; char help_quit[] = - " * quit - closeing a session in remote mode\n\n" + " * quit - closing a session in remote mode\n\n" "\trrdtool quit\n\n"; char help_ls[] = @@ -140,11 +180,15 @@ void PrintUsage(char *cmd) char help_cd[] = " * cd - changes the current directory\n\n" - "\trrdtool cd new direcotry\n\n"; + "\trrdtool cd new directory\n\n"; char help_mkdir[] = - " * mkdir - creates a new direcotry\n\n" - "\trrdtool mkdir newdirecotryname\n\n"; + " * mkdir - creates a new directory\n\n" + "\trrdtool mkdir newdirectoryname\n\n"; + + char help_pwd[] = + " * pwd - returns the current working directory\n\n" + "\trrdtool pwd\n\n"; char help_lic[] = "RRDtool is distributed under the Terms of the GNU General\n" @@ -153,8 +197,9 @@ 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, - C_UPDATE, C_FETCH, C_GRAPH, C_TUNE, C_RESIZE, C_XPORT, - C_QUIT, C_LS, C_CD, C_MKDIR }; + C_LASTUPDATE, C_FIRST, C_UPDATE, C_FETCH, C_GRAPH, C_TUNE, + C_RESIZE, C_XPORT, C_QUIT, C_LS, C_CD, C_MKDIR, C_PWD, + C_UPDATEV }; int help_cmd = C_NONE; @@ -170,8 +215,14 @@ void PrintUsage(char *cmd) help_cmd = C_RESTORE; else if (!strcmp(cmd,"last")) help_cmd = C_LAST; + else if (!strcmp(cmd,"lastupdate")) + help_cmd = C_LASTUPDATE; + else if (!strcmp(cmd,"first")) + help_cmd = C_FIRST; else if (!strcmp(cmd,"update")) help_cmd = C_UPDATE; + else if (!strcmp(cmd,"updatev")) + help_cmd = C_UPDATEV; else if (!strcmp(cmd,"fetch")) help_cmd = C_FETCH; else if (!strcmp(cmd,"graph")) @@ -190,6 +241,8 @@ void PrintUsage(char *cmd) help_cmd = C_CD; else if (!strcmp(cmd,"mkdir")) help_cmd = C_MKDIR; + else if (!strcmp(cmd,"pwd")) + help_cmd = C_PWD; } fputs(help_main, stdout); switch (help_cmd) @@ -215,17 +268,29 @@ void PrintUsage(char *cmd) case C_LAST: fputs(help_last, stdout); break; + case C_LASTUPDATE: + fputs(help_lastupdate, stdout); + break; + case C_FIRST: + fputs(help_first, stdout); + break; case C_UPDATE: fputs(help_update, stdout); break; + case C_UPDATEV: + fputs(help_updatev, stdout); + break; case C_FETCH: 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); @@ -245,18 +310,42 @@ void PrintUsage(char *cmd) case C_MKDIR: fputs(help_mkdir, stdout); break; + case C_PWD: + fputs(help_pwd, stdout); + break; } fputs(help_lic, stdout); } +static char *fgetslong(char **aLinePtr, FILE *stream) +{ + char *linebuf; + size_t bufsize = MAX_LENGTH; + int eolpos = 0; + + if (feof(stream)) return *aLinePtr = 0; + if (!(linebuf = malloc(bufsize))) { + perror("fgetslong: malloc"); + exit(1); + } + linebuf[0] = '\0'; + while (fgets(linebuf + eolpos, MAX_LENGTH, stream)) { + eolpos += strlen(linebuf + eolpos); + if (linebuf[eolpos - 1] == '\n') return *aLinePtr = linebuf; + bufsize += MAX_LENGTH; + if (!(linebuf = realloc(linebuf, bufsize))) { + perror("fgetslong: realloc"); + exit(1); + } + } + return *aLinePtr = linebuf[0] ? linebuf : 0; +} int main(int argc, char *argv[]) { char **myargv; - char aLine[MAX_LENGTH]; -#ifdef HAVE_CHROOT + char *aLine; char *firstdir=""; -#endif #ifdef MUST_DISABLE_SIGFPE signal(SIGFPE,SIG_IGN); #endif @@ -282,9 +371,17 @@ int main(int argc, char *argv[]) gettimeofday(&starttime,&tz); #endif RemoteMode=1; -#ifdef HAVE_CHROOT if ((argc == 3) && strcmp("",argv[2])){ - if (getuid()==0){ + + if ( +#ifdef HAVE_GETUID + getuid() +#else + 1 +#endif + == 0 ){ + +#ifdef HAVE_CHROOT chroot(argv[2]); if (errno!=0){ fprintf(stderr,"ERROR: can't change root to '%s' errno=%d\n", @@ -293,46 +390,44 @@ int main(int argc, char *argv[]) } ChangeRoot=1; firstdir="/"; - } - else{ +#else + fprintf(stderr,"ERROR: change root is not supported by your OS " + "or at least by this copy of rrdtool\n"); + exit(1); +#endif + } else { firstdir=argv[2]; } } 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); } } -#else - fprintf(stderr,"ERROR: change root is not supported by your OS " - "or at least by this copy of rrdtool\n"); - exit(1); -#endif - while (fgets(aLine, sizeof(aLine)-1, stdin)){ + while (fgetslong(&aLine, stdin)){ if ((argc = CountArgs(aLine)) == 0) { - fprintf(stderr,"ERROR: not enough arguments\n"); + printf("ERROR: not enough arguments\n"); } if ((myargv = (char **) malloc((argc+1) * sizeof(char *))) == NULL) { perror("malloc"); - return -1; + exit(1); } if ((argc=CreateArgs(argv[0], aLine, argc, myargv)) < 0) { - fprintf(stderr, "ERROR: creating arguments\n"); - return -1; - } - - if (HandleInputLine(argc, myargv, stdout)) - return -1; - free(myargv); + printf("ERROR: creating arguments\n"); + } else { + int ret = HandleInputLine(argc, myargv, stdout); + free(myargv); + if (ret == 0){ + #if HAVE_GETRUSAGE - getrusage(RUSAGE_SELF,&myusage); - gettimeofday(¤ttime,&tz); - printf("OK u:%1.2f s:%1.2f r:%1.2f\n", + getrusage(RUSAGE_SELF,&myusage); + gettimeofday(¤ttime,&tz); + printf("OK u:%1.2f s:%1.2f r:%1.2f\n", (double)myusage.ru_utime.tv_sec+ (double)myusage.ru_utime.tv_usec/1000000.0, (double)myusage.ru_stime.tv_sec+ @@ -341,9 +436,13 @@ int main(int argc, char *argv[]) +(double)(currenttime.tv_usec-starttime.tv_usec) /1000000.0); #else - printf("OK\n"); -#endif + printf("OK\n"); + +#endif + } + } fflush(stdout); /* this is important for pipes to work */ + free(aLine); } } else if (argc == 2) @@ -356,8 +455,9 @@ int main(int argc, char *argv[]) PrintUsage(argv[2]); exit(0); } - else - HandleInputLine(argc, argv, stderr); + else { + exit(HandleInputLine(argc, argv, stderr)); + } return 0; } @@ -372,14 +472,17 @@ 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 */ + char* cwd; /* To hold current working dir on call to pwd */ + + /* Reset errno to 0 before we start. + */ + errno = 0; if (RemoteMode){ if (argc>1 && strcmp("quit", argv[1]) == 0){ if (argc>2){ printf("ERROR: invalid parameter count for quit\n"); - return(0); + return(1); } exit(0); } @@ -387,43 +490,59 @@ int HandleInputLine(int argc, char **argv, FILE* out) if (argc>1 && strcmp("cd", argv[1]) == 0){ if (argc>3){ printf("ERROR: invalid parameter count for cd\n"); - return(0); + return(1); } #if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID) if (getuid()==0 && ! ChangeRoot){ - printf("ERROR: chdir security problem - rrdtool is runnig as " - "root an no chroot!\n"); - return(0); + printf("ERROR: chdir security problem - rrdtool is running as " + "root but not chroot!\n"); + return(1); } #endif chdir(argv[2]); if (errno!=0){ - printf("ERROR: %s\n",strerror(errno)); + printf("ERROR: %s\n",rrd_strerror(errno)); + return(1); + } + return(0); + } + if (argc>1 && strcmp("pwd", argv[1]) == 0){ + if (argc>2){ + printf("ERROR: invalid parameter count for pwd\n"); + return(1); + } + cwd = getcwd(NULL, MAXPATH); + if(cwd == NULL) { + printf("ERROR: %s\n",rrd_strerror(errno)); + return(1); } + printf("%s\n", cwd); + free(cwd); return(0); } if (argc>1 && strcmp("mkdir", argv[1]) == 0){ if (argc>3){ printf("ERROR: invalid parameter count for mkdir\n"); - return(0); + return(1); } #if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID) if (getuid()==0 && ! ChangeRoot){ - printf("ERROR: mkdir security problem - rrdtool is runnig as " - "root an no chroot!\n"); - return(0); + printf("ERROR: mkdir security problem - rrdtool is running as " + "root but not chroot!\n"); + return(1); } #endif mkdir(argv[2],0777); if (errno!=0){ - printf("ERROR: %s\n",strerror(errno)); + printf("ERROR: %s\n",rrd_strerror(errno)); + return(1); } return(0); } if (argc>1 && strcmp("ls", argv[1]) == 0){ if (argc>2){ printf("ERROR: invalid parameter count for ls\n"); - return(0); + return(1); } if ((curdir=opendir("."))!=NULL){ while((dent=readdir(curdir))!=NULL){ @@ -439,9 +558,10 @@ int HandleInputLine(int argc, char **argv, FILE* out) } } } + closedir(curdir); } else{ - printf("ERROR: %s\n",strerror(errno)); + printf("ERROR: %s\n",rrd_strerror(errno)); return(errno); } return(0); @@ -463,9 +583,13 @@ int HandleInputLine(int argc, char **argv, FILE* out) rrd_create(argc-1, &argv[1]); else if (strcmp("dump", argv[1]) == 0) rrd_dump(argc-1, &argv[1]); - else if (strcmp("info", argv[1]) == 0){ + else if (strcmp("info", argv[1]) == 0 + || strcmp("updatev", argv[1]) == 0){ info_t *data,*save; - data=rrd_info(argc-1, &argv[1]); + if (strcmp("info",argv[1]) == 0) + data=rrd_info(argc-1, &argv[1]); + else + data=rrd_update_v(argc-1, &argv[1]); while (data) { save=data; printf ("%s = ", data->key); @@ -481,6 +605,9 @@ int HandleInputLine(int argc, char **argv, FILE* out) case RD_I_CNT: printf ("%lu", data->value.u_cnt); break; + case RD_I_INT: + printf ("%d", data->value.u_int); + break; case RD_I_STR: printf ("\"%s\"", data->value.u_str); free(data->value.u_str); @@ -492,19 +619,43 @@ int HandleInputLine(int argc, char **argv, FILE* out) } free(data); } - + else if (strcmp("--version", argv[1]) == 0 || strcmp("version", argv[1]) == 0 || strcmp("v", argv[1]) == 0 || strcmp("-v", argv[1]) == 0 || strcmp("-version", argv[1]) == 0 ) - printf("RRDtool 1.1.x Copyright (C) 1997-2003 by Tobias Oetiker \n"); + printf("RRDtool " PACKAGE_VERSION " Copyright by Tobi Oetiker, 1997-2005 (%f)\n", + rrd_version()); 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("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\n\n", XML_ENCODING); @@ -563,11 +723,16 @@ int HandleInputLine(int argc, char **argv, FILE* out) printf ("<%s>%lu", COL_TIME_TAG, ti, COL_TIME_TAG); for (j = 0; j < col_cnt; j++) { rrd_value_t newval = DNAN; + if (enumds == 1) + snprintf(vtag,vtag_s,"%s%lu", COL_DATA_TAG, j); + else + snprintf(vtag,vtag_s,"%s",COL_DATA_TAG); + newval = *ptr; if(isnan(newval)){ - printf("<%s>NaN", COL_DATA_TAG, COL_DATA_TAG); + printf("<%s>NaN", vtag,vtag); } else { - printf("<%s>%0.10e", COL_DATA_TAG, newval, COL_DATA_TAG); + printf("<%s>%0.10e", vtag, newval, vtag); }; ptr++; } @@ -577,18 +742,30 @@ int HandleInputLine(int argc, char **argv, FILE* out) printf(" \n", DATA_TAG); printf("\n", ROOT_TAG); } + free(vtag); } 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; - if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize) != -1 ) { - if (strcmp(imgfile,"-") != 0) + int tostdout = (strcmp(argv[2],"-") == 0); + int imginfo = 0; + for (i=2;i