X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=72fdddb2c30c2badc45dc3848a526f6a6f070bc5;hb=fc04186840774d769fbc2ffcc683cdc1019c089b;hp=a73a304240e59e980c68df55e530b41f7e624cd1;hpb=7ece23c6836d772648c460f9214d070a7b74ed4f;p=rrdtool.git

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index a73a304..72fdddb 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.0.33  Copyright Tobias Oetiker, 1997 - 2001
+ * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2002
  *****************************************************************************
  * rrd_tool.c  Startup wrapper
  *****************************************************************************/
@@ -19,7 +19,7 @@ void PrintUsage(char *cmd)
 {
 
     char help_main[] =
-	   "RRDtool 1.0.33  Copyright 1997-2001 by Tobias Oetiker <tobi@oetiker.ch>\n\n"
+	   "RRDtool 1.1.x  Copyright 1997-2001 by Tobias Oetiker <tobi@oetiker.ch>\n\n"
 	   "Usage: rrdtool [options] command command_options\n\n";
 
     char help_list[] =
@@ -30,14 +30,15 @@ void PrintUsage(char *cmd)
 	   "* create - create a new RRD\n\n"
 	   "\trrdtool create filename [--start|-b start time]\n"
 	   "\t\t[--step|-s step]\n"
-	   "\t\t[DS:ds-name:DST:heartbeat:min:max] [RRA:CF:xff:steps:rows]\n\n";
+	   "\t\t[DS:ds-name:DST:dst arguments]\n" 
+	   "\t\t[RRA:CF:cf arguments]\n\n";
 
     char help_dump[] =
 	   "* dump - dump an RRD to XML\n\n"
 	   "\trrdtool dump filename.rrd >filename.xml\n\n";
 
     char help_info[] =
-	   "* info - returns the configuration and status of the\n\n"
+	   "* info - returns the configuration and status of the RRD\n\n"
 	   "\trrdtool info filename.rrd\n\n";
 
     char help_restore[] =
@@ -73,30 +74,40 @@ 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[--font FONTTAG:size:font]\n"
+           "\t\t[--zoom factor]\n"       
 	   "\t\t[--alt-autoscale]\n"
 	   "\t\t[--alt-autoscale-max]\n"
 	   "\t\t[--units-exponent value]\n"	   
 	   "\t\t[--step seconds]\n"	   
 	   "\t\t[-f|--imginfo printfstr]\n"
-	   "\t\t[-a|--imgformat GIF|PNG]\n"
-	   "\t\t[-c|--color COLORTAG#rrggbb] [-t|--title string]\n"
+	   "\t\t[-a|--imgformat PNG]\n"
+	   "\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[PRINT:vname:CF:format]\n"
 	   "\t\t[GPRINT:vname:CF:format]\n"
-	   "\t\t[HRULE:value#rrggbb[:legend]]\n"
-	   "\t\t[VRULE:value#rrggbb[:legend]]\n"
-	   "\t\t[LINE{1|2|3}:vname[#rrggbb[:legend]]]\n"
-	   "\t\t[AREA:vname[#rrggbb[:legend]]]\n"
-	   "\t\t[STACK:vname[#rrggbb[:legend]]]\n\n";
+	   "\t\t[HRULE:value#rrggbb[aa][:legend]]\n"
+	   "\t\t[VRULE:value#rrggbb[aa][:legend]]\n"
+	   "\t\t[LINE{1|2|3}:vname[#rrggbb[aa][:legend]]]\n"
+	   "\t\t[AREA:vname[#rrggbb[aa][:legend]]]\n"
+	   "\t\t[STACK:vname[#rrggbb[aa][:legend]]]\n\n";
 
     char help_tune[] =
 	   " * tune -  Modify some basic properties of an RRD\n\n"
 	   "\trrdtool tune filename\n"
 	   "\t\t[--heartbeat|-h ds-name:heartbeat]\n"
-	   "\t\t[--data-source-type|-d ds-name:DST\n"
-	   "\t\t[--data-source-rename|-r old-name:new-name\n"
-	   "\t\t[--minimum|-i ds-name:min] [--maximum|-a ds-name:max]\n\n";
+	   "\t\t[--data-source-type|-d ds-name:DST]\n"
+	   "\t\t[--data-source-rename|-r old-name:new-name]\n"
+	   "\t\t[--minimum|-i ds-name:min] [--maximum|-a ds-name:max]\n"
+	   "\t\t[--deltapos scale-value] [--deltaneg scale-value]\n"
+	   "\t\t[--failure-threshold integer]\n"
+	   "\t\t[--window-length integer]\n"
+	   "\t\t[--alpha adaptation-parameter]\n"
+	   "\t\t[--beta adaptation-parameter]\n"
+	   "\t\t[--gamma adaptation-parameter]\n"
+	   "\t\t[--gamma-deviation adaptation-parameter]\n"
+	   "\t\t[--aberrant-reset ds-name]\n\n";
 
     char help_resize[] =
 	   " * resize - alter the lenght of one of the RRAs in an RRD\n\n"
@@ -305,7 +316,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.0.33  Copyright (C) 1997-2001 by Tobias Oetiker <tobi@oetiker.ch>\n");
+        printf("RRDtool 1.1.x  Copyright (C) 1997-2001 by Tobias Oetiker <tobi@oetiker.ch>\n");
     else if (strcmp("restore", argv[1]) == 0)
 	rrd_restore(argc-1, &argv[1]);
     else if (strcmp("resize", argv[1]) == 0)
@@ -325,7 +336,7 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	    for (i = 0; i<ds_cnt;i++)
 	        printf("%14s",ds_namv[i]);
 	    printf ("\n\n");
-	    for (i = start; i <= end; i += step){
+	    for (i = start+step; i <= end; i += step){
 	        printf("%10lu:", i);
 	        for (ii = 0; ii < ds_cnt; ii++)
 		    printf(" %0.10e", *(datai++));