From: Tobias Oetiker <tobi@oetiker.ch>
Date: Sun, 15 Jan 2006 12:31:03 +0000 (+0000)
Subject: make sure the image size only gets printed from rrd_tool when --imageinfo is NOT... 
X-Git-Tag: 1.2.13~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=538f4d3b637547786fc7e644edff9766911b61d5;p=thirdparty%2Frrdtool-1.x.git

make sure the image size only gets printed from rrd_tool when --imageinfo is NOT set.


git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@747 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 2e0bf9cf..81c4bae9 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -650,8 +650,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<argc;i++){
+		if (strcmp(argv[i],"--imginfo") == 0 || strcmp(argv[i],"-f") == 0){
+			imginfo = 1;
+			break;
+		}
+	}
 	if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL, &ymin, &ymax) != -1 ) {
-	    if (!tostdout) 
+	    if (!tostdout && !imginfo) 
 		printf ("%dx%d\n",xsize,ysize);
 	    if (calcpr) {
 		for(i=0;calcpr[i];i++){