X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=ec45952a19f6326cf950a32d5939057082aae3ae;hb=9470c36a8d025ff8888f0b76264968ac0342aa9e;hp=e6b4c5a65486483e566ce9d8a312179b0e6d6917;hpb=87617d608f152fd298bcace0d881c92b5538d65d;p=rrdtool.git

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index e6b4c5a..ec45952 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.3  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.9  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_tool.c  Startup wrapper
  *****************************************************************************/
@@ -22,8 +22,8 @@ void PrintUsage(char *cmd)
 {
 
     char help_main[] =
-	   "RRDtool 1.2.3  Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+	   "RRDtool " PACKAGE_VERSION "  Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
            "               Compiled " __DATE__ " " __TIME__ "\n\n"
 #else
            "               Compiled " MAKE_TIMESTAMP "\n\n"
@@ -81,7 +81,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 +101,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,10 +117,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";
-    char help_graph3[] =
+	   "\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[CDEF:vname=rpn-expression]\n";
+    char help_graph3[] =
 	   "\t\t[VDEF:vdefname=rpn-expression]\n"
 	   "\t\t[PRINT:vdefname:format]\n"
 	   "\t\t[GPRINT:vdefname:format]\n"
@@ -552,7 +552,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.3  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 +587,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("<?xml version=\"1.0\" encoding=\"%s\"?>\n\n", XML_ENCODING);