X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=2cad365e32374d034cc8a224b5ff47eb02002e80;hb=0e35f35b43f96e2a805b2c4d73c0b5ccf5361975;hp=1795c8458d6934b70a406b40b8c5850567c61c91;hpb=b48f8f963467ce3e608e286c6dff08b54e05bcef;p=rrdtool.git

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 1795c84..2cad365 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -23,11 +23,15 @@ void PrintUsage(char *cmd)
 
     char help_main[] =
 	   "RRDtool 1.1.x  Copyright 1997-2003 by Tobias Oetiker <tobi@oetiker.ch>\n"
+#ifndef WIN32
            "               Compiled " MAKE_TIMESTAMP "\n\n"
+#else
+           "               Compiled " __DATE__ " " __TIME__ "\n\n"
+#endif          
 	   "Usage: rrdtool [options] command command_options\n\n";
 
     char help_list[] =
-	   "Valid commands: create, update, graph, dump, restore,\n"
+	   "Valid commands: create, update, updatev, graph, dump, restore,\n"
 	   "\t\tlast, info, fetch, tune, resize, xport\n\n";
 
     char help_listremote[] =
@@ -51,7 +55,7 @@ void PrintUsage(char *cmd)
 
     char help_restore[] =
 	   "* restore - restore an RRD file from its XML form\n\n"
-	   "\trrdtool restore [--range-check|-r] filename.xml filename.rrd\n\n";
+	   "\trrdtool restore [--range-check|-r] [--force-overwrite|-f] filename.xml filename.rrd\n\n";
 
     char help_last[] =
            "* last - show last update time for RRD\n\n"
@@ -64,6 +68,15 @@ 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_updatev[] =
+	   "* updatev - a verbose verion of update\n"
+	   "\treturns information about values, RRAs, and datasources updated\n\n"
+	   "\trrdtool updatev filename\n"
+	   "\t\t--template|-t ds-name:ds-name:...\n"
+	   "\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"
@@ -82,6 +95,7 @@ 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[-j|--only-graph]\n"
 	   "\t\t[--font FONTTAG:size:font]\n"
            "\t\t[--zoom factor]\n"       
 	   "\t\t[--alt-autoscale]\n"
@@ -154,7 +168,7 @@ void PrintUsage(char *cmd)
 
     enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST,
 	   C_UPDATE, C_FETCH, C_GRAPH, C_TUNE, C_RESIZE, C_XPORT,
-           C_QUIT, C_LS, C_CD, C_MKDIR };
+           C_QUIT, C_LS, C_CD, C_MKDIR, C_UPDATEV };
 
     int help_cmd = C_NONE;
 
@@ -172,6 +186,8 @@ void PrintUsage(char *cmd)
 		help_cmd = C_LAST;
     	    else if (!strcmp(cmd,"update"))
 		help_cmd = C_UPDATE;
+    	    else if (!strcmp(cmd,"updatev"))
+		help_cmd = C_UPDATEV;
     	    else if (!strcmp(cmd,"fetch"))
 		help_cmd = C_FETCH;
     	    else if (!strcmp(cmd,"graph"))
@@ -218,6 +234,9 @@ void PrintUsage(char *cmd)
 	    case C_UPDATE:
 		fputs(help_update, stdout);
 		break;
+	    case C_UPDATEV:
+		fputs(help_updatev, stdout);
+		break;
 	    case C_FETCH:
 		fputs(help_fetch, stdout);
 		break;
@@ -463,9 +482,13 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	rrd_create(argc-1, &argv[1]);
     else if (strcmp("dump", argv[1]) == 0)
 	rrd_dump(argc-1, &argv[1]);
-    else if (strcmp("info", argv[1]) == 0){
+    else if (strcmp("info", argv[1]) == 0 
+		|| strcmp("updatev", argv[1]) == 0){
 	info_t *data,*save;
-	data=rrd_info(argc-1, &argv[1]);
+	if (strcmp("info",argv[1]) == 0)
+	   data=rrd_info(argc-1, &argv[1]);
+    else
+	   data=rrd_update_v(argc-1, &argv[1]);
 	while (data) {
 	    save=data;
 	    printf ("%s = ", data->key);
@@ -481,6 +504,9 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	    case RD_I_CNT:
 		printf ("%lu", data->value.u_cnt);
 		break;
+	    case RD_I_INT:
+		printf ("%d", data->value.u_int);
+		break;
 	    case RD_I_STR:
 		printf ("\"%s\"", data->value.u_str);
 		free(data->value.u_str);
@@ -516,7 +542,7 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	    datai=data;
 	    printf("           ");
 	    for (i = 0; i<ds_cnt;i++)
-	        printf("%14s",ds_namv[i]);
+	        printf("%20s",ds_namv[i]);
 	    printf ("\n\n");
 	    for (ti = start+step; ti <= end; ti += step){
 	        printf("%10lu:", ti);
@@ -583,12 +609,13 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	const char *imgfile = argv[2]; /* rrd_graph changes argv pointer */
 	int xsize, ysize;
 	int i;
-	if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize) != -1 ) {
-	    if (strcmp(imgfile,"-") != 0) 
+	int tostdout = (strcmp(argv[2],"-") == 0);	
+	if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL) != -1 ) {
+	    if (!tostdout) 
 		printf ("%dx%d\n",xsize,ysize);
 	    if (calcpr) {
 		for(i=0;calcpr[i];i++){
-		    if (strcmp(imgfile,"-") != 0) 
+		    if (!tostdout) 
 			printf("%s\n",calcpr[i]);
 		    free(calcpr[i]);
 		}