X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=program%2Fsrc%2Frrd_tool.c;h=bcb1d07cb8751700d4db7b7a3ccb35cee60a3ca2;hb=fc1e020dfd737036c4f456b6ee853c8230eda4b5;hp=f1eb11618e18b5a4b98dc8b01ddcd0233d675692;hpb=27bd57bf63ac4fcf8e5aa0c0e657dd0def4fe396;p=rrdtool-all.git diff --git a/program/src/rrd_tool.c b/program/src/rrd_tool.c index f1eb1161..bcb1d07c 100644 --- a/program/src/rrd_tool.c +++ b/program/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.2.28 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ @@ -22,7 +22,7 @@ void PrintUsage(char *cmd) { char help_main[] = - "RRDtool " PACKAGE_VERSION " Copyright 1997-2007 by Tobias Oetiker \n" + "RRDtool " PACKAGE_VERSION " Copyright 1997-2008 by Tobias Oetiker \n" " Compiled " __DATE__ " " __TIME__ "\n\n" "Usage: rrdtool [options] command command_options\n\n"; @@ -99,6 +99,7 @@ void PrintUsage(char *cmd) "\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[--right-axis scale:shift] [--right-axis-label label]\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" @@ -379,8 +380,7 @@ int main(int argc, char *argv[]) == 0 ){ #ifdef HAVE_CHROOT - chroot(argv[2]); - if (errno!=0){ + if (chroot(argv[2]) != 0){ fprintf(stderr,"ERROR: can't change root to '%s' errno=%d\n", argv[2],errno); exit(errno); @@ -397,8 +397,7 @@ int main(int argc, char *argv[]) } } if (strcmp(firstdir,"")){ - chdir(firstdir); - if (errno!=0){ + if (chdir(firstdir)!=0){ fprintf(stderr,"ERROR: %s\n",rrd_strerror(errno)); exit(errno); } @@ -496,8 +495,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) return(1); } #endif - chdir(argv[2]); - if (errno!=0){ + if (chdir(argv[2]) != 0){ printf("ERROR: %s\n",rrd_strerror(errno)); return(1); } @@ -529,8 +527,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) return(1); } #endif - mkdir(argv[2],0777); - if (errno!=0){ + if (mkdir(argv[2],0777) != 0){ printf("ERROR: %s\n",rrd_strerror(errno)); return(1); }