X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=dd3f0f9197e1b266bfdbfad6a9103c91c39a68bc;hb=87bfb3981c5c5bbf5843144a1d94c4011043592d;hp=9f5489b0ebb4ae31adbc45bdd4847b585c8c85ea;hpb=8595dbdbc4cecd28afe6ff795ed0eb3ae34fddc3;p=rrdtool.git diff --git a/src/rrd_tool.c b/src/rrd_tool.c index 9f5489b..dd3f0f9 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.1 Copyright by Tobi Oetiker, 1997-2005 + * RRDtool 1.2.12 Copyright by Tobi Oetiker, 1997-2005 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ @@ -22,12 +22,8 @@ void PrintUsage(char *cmd) { char help_main[] = - "RRDtool 1.2.1 Copyright 1997-2005 by Tobias Oetiker \n" -#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) + "RRDtool " PACKAGE_VERSION " Copyright 1997-2006 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[] = @@ -81,7 +77,7 @@ 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_fetch[] = "* fetch - fetch data out of an RRD\n\n" "\trrdtool fetch filename.rrd CF\n" @@ -101,9 +97,9 @@ 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"; + "\t\t[-F|--force-rules-legend]\n" + "\t\t[-j|--only-graph]\n"; char help_graph2[] = - "\t\t[-j|--only-graph]\n" "\t\t[-n|--font FONTTAG:size:font]\n" "\t\t[-m|--zoom factor]\n" "\t\t[-A|--alt-autoscale]\n" @@ -117,9 +113,10 @@ void PrintUsage(char *cmd) "\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[-c|--color COLORTAG#rrggbb[aa]] [-t|--title string]\n" + "\t\t[-W|--watermark string]\n" + "\t\t[DEF:vname=rrd:ds-name:CF]\n"; char help_graph3[] = - "\t\t[DEF:vname=rrd:ds-name:CF]\n" "\t\t[CDEF:vname=rpn-expression]\n" "\t\t[VDEF:vdefname=rpn-expression]\n" "\t\t[PRINT:vdefname:format]\n" @@ -303,9 +300,7 @@ int main(int argc, char *argv[]) { char **myargv; char aLine[MAX_LENGTH]; -#ifdef HAVE_CHROOT char *firstdir=""; -#endif #ifdef MUST_DISABLE_SIGFPE signal(SIGFPE,SIG_IGN); #endif @@ -331,9 +326,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 +345,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 +361,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)){ 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 +372,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,8 +391,11 @@ 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 */ } } @@ -426,7 +431,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) 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 +439,45 @@ 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("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){ @@ -552,7 +559,8 @@ 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.2.1 Copyright by Tobi Oetiker, 1997-2005\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) @@ -586,13 +594,13 @@ int HandleInputLine(int argc, char **argv, FILE* out) free (data); } } else if (strcmp("xport", argv[1]) == 0) { - int xxsize; + 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], &xxsize,&start,&end,&step,&col_cnt,&legend_v,&data) != -1) { row_cnt = (end-start)/step; ptr = data; printf("\n\n", XML_ENCODING); @@ -643,8 +651,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