3 patches, #3 depends on #1 as EPS uses AFM for stringwidth too.

[rrdtool.git] / src / rrd_tool.c

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 1ee3a6d..a86e0ed 100644 (file)
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.0.33  Copyright Tobias Oetiker, 1997 - 2001
+ * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2002
  *****************************************************************************
  * rrd_tool.c  Startup wrapper
  *****************************************************************************/
@@ -19,7 +19,7 @@ void PrintUsage(char *cmd)
 {
 
     char help_main[] =
-          "RRDtool 1.0.33  Copyright 1997-2001 by Tobias Oetiker <tobi@oetiker.ch>\n\n"
+          "RRDtool 1.1.x  Copyright 1997-2001 by Tobias Oetiker <tobi@oetiker.ch>\n\n"
           "Usage: rrdtool [options] command command_options\n\n";
 
     char help_list[] =
@@ -81,7 +81,7 @@ void PrintUsage(char *cmd)
           "\t\t[--units-exponent value]\n"        
           "\t\t[--step seconds]\n"        
           "\t\t[-f|--imginfo printfstr]\n"
-          "\t\t[-a|--imgformat GIF|PNG]\n"
+          "\t\t[-a|--imgformat PNG]\n"
           "\t\t[-c|--color COLORTAG#rrggbb[aa]] [-t|--title string]\n"
           "\t\t[DEF:vname=rrd:ds-name:CF]\n"
           "\t\t[CDEF:vname=rpn-expression]\n"
@@ -316,7 +316,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.0.33  Copyright (C) 1997-2001 by Tobias Oetiker <tobi@oetiker.ch>\n");
+        printf("RRDtool 1.1.x  Copyright (C) 1997-2001 by Tobias Oetiker <tobi@oetiker.ch>\n");
     else if (strcmp("restore", argv[1]) == 0)
        rrd_restore(argc-1, &argv[1]);
     else if (strcmp("resize", argv[1]) == 0)
@@ -350,14 +350,15 @@ int HandleInputLine(int argc, char **argv, FILE* out)
     }
     else if (strcmp("graph", argv[1]) == 0) {
        char **calcpr;
+       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(argv[2],"-") != 0) 
+           if (strcmp(imgfile,"-") != 0) 
                printf ("%dx%d\n",xsize,ysize);
            if (calcpr) {
                for(i=0;calcpr[i];i++){
-                   if (strcmp(argv[2],"-") != 0) 
+                   if (strcmp(imgfile,"-") != 0) 
                        printf("%s\n",calcpr[i]);
                    free(calcpr[i]);
                }