X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.c;h=bda631d2f49ee51ad60dd3d420d582ef2c4882a7;hp=d3bc2768643bcacb2bdf0ec94f133b65e7cd76c0;hb=d754fa67f418cac48a6722d4d6e44d16fee64648;hpb=0c06404fd40724f9e1318715c1e737302658befb

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index d3bc276..bda631d 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -57,7 +57,7 @@ void PrintUsage(
         N_
         ("Valid commands: create, update, updatev, graph, graphv,  dump, restore,\n"
          "\t\tlast, lastupdate, first, info, fetch, tune,\n"
-         "\t\tresize, xport, flush\n\n");
+         "\t\tresize, xport, flushcached\n\n");
 
     const char *help_listremote =
         N_("Valid remote commands: quit, ls, cd, mkdir, pwd\n\n");
@@ -119,9 +119,9 @@ void PrintUsage(
            "\t\t[-s|--start start] [-e|--end end]\n"
 	   "\t\t[--daemon <address>]\n\n");
 
-    const char *help_flush =
-        N_("* flush - flush cached data out to an RRD file\n\n"
-           "\trrdtool flush filename.rrd\n"
+    const char *help_flushcached =
+        N_("* flushcached - flush cached data out to an RRD file\n\n"
+           "\trrdtool flushcached filename.rrd\n"
 	   "\t\t[--daemon <address>]\n\n");
 
 /* break up very large strings (help_graph, help_tune) for ISO C89 compliance*/
@@ -139,7 +139,7 @@ void PrintUsage(
            "\t\t[-y|--y-grid y-axis grid and label]\n"
            "\t\t[-v|--vertical-label string] [-w|--width pixels]\n"
            "\t\t[--right-axis scale:shift] [--right-axis-label label]\n"
-           "\t\t[--right-axis-format format]\n"          
+           "\t\t[--right-axis-format format]\n"
            "\t\t[-h|--height pixels] [-o|--logarithmic]\n"
            "\t\t[-u|--upper-limit value] [-z|--lazy]\n"
            "\t\t[-l|--lower-limit value] [-r|--rigid]\n"
@@ -150,6 +150,7 @@ void PrintUsage(
            "\t\t[-m|--zoom factor]\n"
            "\t\t[-A|--alt-autoscale]\n"
            "\t\t[-M|--alt-autoscale-max]\n"
+           "\t\t[-G|--graph-render-mode {normal,mono}]\n"
            "\t\t[-R|--font-render-mode {normal,light,mono}]\n"
            "\t\t[-B|--font-smoothing-threshold size]\n"
            "\t\t[-T|--tabwidth width]\n"
@@ -160,7 +161,9 @@ void PrintUsage(
            "\t\t[-S|--step seconds]\n"
            "\t\t[-f|--imginfo printfstr]\n"
            "\t\t[-a|--imgformat PNG]\n"
-           "\t\t[-c|--color COLORTAG#rrggbb[aa]] [-t|--title string]\n"
+           "\t\t[-c|--color COLORTAG#rrggbb[aa]]\n"
+           "\t\t[--border width\n"
+           "\t\t[-t|--title string]\n"
            "\t\t[-W|--watermark string]\n"
            "\t\t[DEF:vname=rrd:ds-name:CF]\n");
     const char *help_graph3 =
@@ -228,7 +231,7 @@ void PrintUsage(
         C_LASTUPDATE, C_FIRST, C_UPDATE, C_FETCH, C_GRAPH, C_GRAPHV,
         C_TUNE,
         C_RESIZE, C_XPORT, C_QUIT, C_LS, C_CD, C_MKDIR, C_PWD,
-        C_UPDATEV, C_FLUSH
+        C_UPDATEV, C_FLUSHCACHED
     };
     int       help_cmd = C_NONE;
 
@@ -253,8 +256,8 @@ void PrintUsage(
             help_cmd = C_UPDATEV;
         else if (!strcmp(cmd, "fetch"))
             help_cmd = C_FETCH;
-        else if (!strcmp(cmd, "flush"))
-            help_cmd = C_FLUSH;
+        else if (!strcmp(cmd, "flushcached"))
+            help_cmd = C_FLUSHCACHED;
         else if (!strcmp(cmd, "graph"))
             help_cmd = C_GRAPH;
         else if (!strcmp(cmd, "graphv"))
@@ -315,8 +318,8 @@ void PrintUsage(
     case C_FETCH:
         fputs(_(help_fetch), stdout);
         break;
-    case C_FLUSH:
-        fputs(_(help_flush), stdout);
+    case C_FLUSHCACHED:
+        fputs(_(help_flushcached), stdout);
         break;
     case C_GRAPH:
         fputs(_(help_graph0), stdout);
@@ -407,12 +410,13 @@ int main(
     fpsetmask(0);
 #endif
 #ifdef HAVE_LOCALE_H
+    /* initialize locale settings
+       according to localeconv(3) */       
     setlocale(LC_ALL, "");
 #endif
 
 #if defined(HAVE_LIBINTL_H) && defined(BUILD_LIBINTL)
     bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
-    bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
     textdomain(GETTEXT_PACKAGE);
 #endif
     if (argc == 1) {
@@ -528,7 +532,6 @@ int HandleInputLine(
 #if defined(HAVE_SYS_STAT_H)
     struct stat st;
 #endif
-    char     *cwd;      /* To hold current working dir on call to pwd */
 
     /* Reset errno to 0 before we start.
      */
@@ -561,6 +564,7 @@ int HandleInputLine(
             return (0);
         }
         if (argc > 1 && strcmp("pwd", argv[1]) == 0) {
+            char     *cwd;      /* To hold current working dir on call to pwd */
             if (argc > 2) {
                 printf("ERROR: invalid parameter count for pwd\n");
                 return (1);
@@ -812,8 +816,8 @@ int HandleInputLine(
 
     } else if (strcmp("tune", argv[1]) == 0)
         rrd_tune(argc - 1, &argv[1]);
-    else if (strcmp("flush", argv[1]) == 0)
-        rrd_cmd_flush(argc - 1, &argv[1]);
+    else if (strcmp("flushcached", argv[1]) == 0)
+        rrd_flushcached(argc - 1, &argv[1]);
     else {
         rrd_set_error("unknown function '%s'", argv[1]);
     }