X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=2cad365e32374d034cc8a224b5ff47eb02002e80;hb=6f5f5aa3846525e47938e9caa8b6c65451ddf9d7;hp=7ef262ff563e551ad7f538e77eb6c5363598470a;hpb=bf7d0302ab2ff46038f7002a9eab76f4105c3cee;p=rrdtool.git

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 7ef262f..2cad365 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -55,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"
@@ -95,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"
@@ -541,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);
@@ -609,7 +610,7 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	int xsize, ysize;
 	int i;
 	int tostdout = (strcmp(argv[2],"-") == 0);	
-	if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize) != -1 ) {
+	if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL) != -1 ) {
 	    if (!tostdout) 
 		printf ("%dx%d\n",xsize,ysize);
 	    if (calcpr) {