X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=c123baf1a4a1dab2abdb87651a5c16a20d168d56;hb=ab384eb6dac85f5f57dabcfc16114fcaf79d5e94;hp=7b4d77eef43d544469ed8e8305c567ebd7e9e3dd;hpb=a80f247e7d6dc00e9598fa0036ec3ff6022663ac;p=rrdtool.git

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 7b4d77e..c123baf 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2rc4  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.1  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_tool.c  Startup wrapper
  *****************************************************************************/
@@ -22,7 +22,7 @@ void PrintUsage(char *cmd)
 {
 
     char help_main[] =
-	   "RRDtool 1.2rc4  Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
+	   "RRDtool 1.2.1  Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
 #if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
            "               Compiled " __DATE__ " " __TIME__ "\n\n"
 #else
@@ -108,7 +108,9 @@ void PrintUsage(char *cmd)
            "\t\t[--zoom factor]\n"       
 	   "\t\t[--alt-autoscale]\n"
 	   "\t\t[--alt-autoscale-max]\n"
-	   "\t\t[--units-exponent value]\n"	   
+	   "\t\t[--no-gridfit]\n"
+	   "\t\t[--units-exponent value]\n"
+	   "\t\t[--units-length value]\n"
 	   "\t\t[--step seconds]\n"	   
 	   "\t\t[-f|--imginfo printfstr]\n"
 	   "\t\t[-a|--imgformat PNG]\n"
@@ -116,12 +118,15 @@ void PrintUsage(char *cmd)
     char help_graph3[] =
 	   "\t\t[DEF:vname=rrd:ds-name:CF]\n"
 	   "\t\t[CDEF:vname=rpn-expression]\n"
+	   "\t\t[VDEF:vdefname=rpn-expression]\n"
 	   "\t\t[PRINT:vname:CF:format]\n"
 	   "\t\t[GPRINT:vname:CF:format]\n"
+	   "\t\t[PRINT:vdefname:format]\n"
+	   "\t\t[GPRINT:vdefname:format]\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[LINE{1|2|3}:vname[#rrggbb[aa][:legend]][:STACK]]\n"
+	   "\t\t[AREA:vname[#rrggbb[aa][:legend]][:STACK]]\n"
 	   "\t\t[STACK:vname[#rrggbb[aa][:legend]]]\n\n";
 
     char help_tune1[] =
@@ -411,8 +416,6 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 #if defined(HAVE_SYS_STAT_H)
     struct stat   st;
 #endif
-    optind=0; /* reset gnu getopt */
-    opterr=0; /* no error messages */
 
     if (RemoteMode){
        if (argc>1 && strcmp("quit", argv[1]) == 0){
@@ -544,7 +547,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.2rc4  Copyright by Tobi Oetiker, 1997-2005\n");
+        printf("RRDtool 1.2.1  Copyright by Tobi Oetiker, 1997-2005\n");
     else if (strcmp("restore", argv[1]) == 0)
 	rrd_restore(argc-1, &argv[1]);
     else if (strcmp("resize", argv[1]) == 0)