X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.c;h=fb0fafead8c3c1f19f62d6592567df2a00c64be6;hp=fce0925c8e8945f53c8cc25c586572a6ab009d08;hb=f207955a7e325708d056d3dd912863dc9930a71c;hpb=ee05ed1738e83a66698307c68ac0855a5dcc961f

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index fce0925..fb0fafe 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2004
+ * RRDtool 1.2rc6  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_tool.c  Startup wrapper
  *****************************************************************************/
@@ -22,17 +22,17 @@ void PrintUsage(char *cmd)
 {
 
     char help_main[] =
-	   "RRDtool 1.1.x  Copyright 1997-2004 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";
 
     char help_list[] =
 	   "Valid commands: create, update, updatev, graph, dump, restore,\n"
-	   "\t\tlast, info, fetch, tune, resize, xport\n\n";
+	   "\t\tlast, first, info, fetch, tune, resize, xport\n\n";
 
     char help_listremote[] =
            "Valid remote commands: quit, ls, cd, mkdir\n\n";
@@ -61,6 +61,10 @@ void PrintUsage(char *cmd)
            "* last - show last update time for RRD\n\n"
            "\trrdtool last filename.rrd\n\n";
 
+    char help_first[] =
+           "* first - show first update time for RRA within an RRD\n\n"
+           "\trrdtool first filename.rrd [--rraindex number]\n\n";
+
     char help_update[] =
 	   "* update - update an RRD\n\n"
 	   "\trrdtool update filename\n"
@@ -112,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[] =
@@ -173,7 +180,7 @@ void PrintUsage(char *cmd)
 
 	   "For more information read the RRD manpages\n\n";
 
-    enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST,
+    enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST, C_FIRST,
 	   C_UPDATE, C_FETCH, C_GRAPH, C_TUNE, C_RESIZE, C_XPORT,
            C_QUIT, C_LS, C_CD, C_MKDIR, C_UPDATEV };
 
@@ -191,6 +198,8 @@ void PrintUsage(char *cmd)
 		help_cmd = C_RESTORE;
     	    else if (!strcmp(cmd,"last"))
 		help_cmd = C_LAST;
+    	    else if (!strcmp(cmd,"first"))
+		help_cmd = C_FIRST;
     	    else if (!strcmp(cmd,"update"))
 		help_cmd = C_UPDATE;
     	    else if (!strcmp(cmd,"updatev"))
@@ -238,6 +247,9 @@ void PrintUsage(char *cmd)
 	    case C_LAST:
 		fputs(help_last, stdout);
 		break;
+	    case C_FIRST:
+		fputs(help_first, stdout);
+		break;
 	    case C_UPDATE:
 		fputs(help_update, stdout);
 		break;
@@ -347,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
@@ -386,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;
 }
@@ -537,13 +547,15 @@ 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.1.x  Copyright (C) 1997-2004 by Tobias Oetiker <tobi@oetiker.ch>\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)
 	rrd_resize(argc-1, &argv[1]);
     else if (strcmp("last", argv[1]) == 0)
         printf("%ld\n",rrd_last(argc-1, &argv[1]));
+    else if (strcmp("first", argv[1]) == 0)
+        printf("%ld\n",rrd_first(argc-1, &argv[1]));
     else if (strcmp("update", argv[1]) == 0)
 	rrd_update(argc-1, &argv[1]);
     else if (strcmp("fetch", argv[1]) == 0) {
@@ -623,9 +635,10 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	const char *imgfile = argv[2]; /* rrd_graph changes argv pointer */
 #endif
 	int xsize, ysize;
+	double ymin,ymax;
 	int i;
 	int tostdout = (strcmp(argv[2],"-") == 0);	
-	if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL) != -1 ) {
+	if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL, &ymin, &ymax) != -1 ) {
 	    if (!tostdout) 
 		printf ("%dx%d\n",xsize,ysize);
 	    if (calcpr) {