X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.c;h=fb0fafead8c3c1f19f62d6592567df2a00c64be6;hp=600867ea9cacc35d80d267ee5b16ff0466c3472a;hb=f9e5bd6a9d41c4607291cbbd88280129184ab325;hpb=0f399ee8cbe875b2831ea2870e60ee17800d811d

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 600867e..fb0fafe 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2rc2  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2rc6  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_tool.c  Startup wrapper
  *****************************************************************************/
@@ -22,11 +22,11 @@ void PrintUsage(char *cmd)
 {
 
     char help_main[] =
-	   "RRDtool 1.2rc2  Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
-#ifndef WIN32
-           "               Compiled " MAKE_TIMESTAMP "\n\n"
-#else
+	   "RRDtool 1.2rc6  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"
 #endif          
 	   "Usage: rrdtool [options] command command_options\n\n";
 
@@ -116,12 +116,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[] =
@@ -356,15 +359,15 @@ int main(int argc, char *argv[])
 		if ((myargv = (char **) malloc((argc+1) * 
 					       sizeof(char *))) == NULL)   {
 		    perror("malloc");
-		    return -1;
+		    exit(1);
 		}
 		if ((argc=CreateArgs(argv[0], aLine, argc, myargv)) < 0) {
 		    fprintf(stderr, "ERROR: creating arguments\n");
-		    return -1;
+		    exit(1);
 		}
 
 		if (HandleInputLine(argc, myargv, stdout))
-		    return -1;
+		    exit(1);
 		free(myargv);
 
 #if HAVE_GETRUSAGE
@@ -395,9 +398,7 @@ int main(int argc, char *argv[])
 		exit(0);
 	}
     else {
-        if(HandleInputLine(argc, argv, stderr)) {
-            return 1;
-        }
+        exit(HandleInputLine(argc, argv, stderr));
     }
     return 0;
 }
@@ -546,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.2rc2  Copyright by Tobi Oetiker, 1997-2005\n");
+        printf("RRDtool 1.2rc6  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)