X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.c;h=f0a889f24c69a08090730a197af197120b983303;hp=a5a4e008c447317b6b1e2fbf71c481e17bc9756f;hb=7f4dd5f9c0f20e4d6690685641a9cd8ea621da51;hpb=b55bfd4ce65915eed82ada1c74e7cc5dcefa3405 diff --git a/src/rrd_tool.c b/src/rrd_tool.c index a5a4e00..f0a889f 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.8 Copyright by Tobi Oetiker, 1997-2005 + * RRDtool 1.2.20 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ @@ -22,20 +22,17 @@ void PrintUsage(char *cmd) { char help_main[] = - "RRDtool " PACKAGE_VERSION " Copyright 1997-2005 by Tobias Oetiker \n" -#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) + "RRDtool " PACKAGE_VERSION " Copyright 1997-2007 by Tobias Oetiker \n" " Compiled " __DATE__ " " __TIME__ "\n\n" -#else - " Compiled " MAKE_TIMESTAMP "\n\n" -#endif "Usage: rrdtool [options] command command_options\n\n"; char help_list[] = "Valid commands: create, update, updatev, graph, dump, restore,\n" - "\t\tlast, first, info, fetch, tune, resize, xport\n\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[] = @@ -61,6 +58,11 @@ void PrintUsage(char *cmd) "* 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"; @@ -118,9 +120,10 @@ void PrintUsage(char *cmd) "\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[CDEF:vname=rpn-expression]\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[VDEF:vdefname=rpn-expression]\n" "\t\t[PRINT:vdefname:format]\n" "\t\t[GPRINT:vdefname:format]\n" @@ -162,6 +165,7 @@ 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"; @@ -182,15 +186,20 @@ void PrintUsage(char *cmd) " * 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" "Public License Version 2. (www.gnu.org/copyleft/gpl.html)\n\n" "For more information read the RRD manpages\n\n"; - 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 }; + enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST, + 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; @@ -206,6 +215,8 @@ 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")) @@ -230,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) @@ -255,6 +268,9 @@ 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; @@ -294,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 @@ -331,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", @@ -342,8 +390,12 @@ 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]; } } @@ -354,15 +406,10 @@ int main(int argc, char *argv[]) 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) { @@ -370,17 +417,17 @@ int main(int argc, char *argv[]) exit(1); } if ((argc=CreateArgs(argv[0], aLine, argc, myargv)) < 0) { - fprintf(stderr, "ERROR: creating arguments\n"); - exit(1); - } - - HandleInputLine(argc, myargv, stdout); - 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+ @@ -389,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) @@ -421,12 +472,17 @@ int HandleInputLine(int argc, char **argv, FILE* out) #if defined(HAVE_SYS_STAT_H) struct stat st; #endif + 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); } @@ -434,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 running as " - "root an no chroot!\n"); - return(0); + "root but not chroot!\n"); + return(1); } #endif chdir(argv[2]); if (errno!=0){ 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 running as " - "root an no chroot!\n"); - return(0); + "root but not chroot!\n"); + return(1); } #endif mkdir(argv[2],0777); if (errno!=0){ 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){ @@ -486,6 +558,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) } } } + closedir(curdir); } else{ printf("ERROR: %s\n",rrd_strerror(errno)); @@ -546,7 +619,7 @@ 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 || @@ -560,7 +633,28 @@ int HandleInputLine(int argc, char **argv, FILE* out) 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) + 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); @@ -620,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++; } @@ -634,6 +742,7 @@ 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; @@ -644,8 +753,15 @@ int HandleInputLine(int argc, char **argv, FILE* out) double ymin,ymax; int i; int tostdout = (strcmp(argv[2],"-") == 0); + int imginfo = 0; + for (i=2;i