X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=037894085141c1a3c54d5cc18e19c28061f25274;hb=3ad3f71563ec6fc341f3390a2c630b4f49034845;hp=5fcb4404e3a369c0305cde7e87653b34dbab8c93;hpb=298b318acaf1147474ab9e97cac37c3608660efd;p=rrdtool.git diff --git a/src/rrd_tool.c b/src/rrd_tool.c index 5fcb440..0378940 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -22,7 +22,8 @@ void PrintUsage(char *cmd) { char help_main[] = - "RRDtool 1.1.x Copyright 1997-2001 by Tobias Oetiker \n\n" + "RRDtool 1.1.x Copyright 1997-2003 by Tobias Oetiker \n" + " Compiled " MAKE_TIMESTAMP "\n\n" "Usage: rrdtool [options] command command_options\n\n"; char help_list[] = @@ -497,7 +498,7 @@ 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-2001 by Tobias Oetiker \n"); + printf("RRDtool 1.1.x Copyright (C) 1997-2003 by Tobias Oetiker \n"); else if (strcmp("restore", argv[1]) == 0) rrd_restore(argc-1, &argv[1]); else if (strcmp("resize", argv[1]) == 0) @@ -582,12 +583,13 @@ int HandleInputLine(int argc, char **argv, FILE* out) const char *imgfile = argv[2]; /* rrd_graph changes argv pointer */ int xsize, ysize; int i; + int tostdout = (strcmp(argv[2],"-") == 0); if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize) != -1 ) { - if (strcmp(imgfile,"-") != 0) + if (!tostdout) printf ("%dx%d\n",xsize,ysize); if (calcpr) { for(i=0;calcpr[i];i++){ - if (strcmp(imgfile,"-") != 0) + if (!tostdout) printf("%s\n",calcpr[i]); free(calcpr[i]); }