X-Git-Url: https://git.tokkee.org/?p=pkg-rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.c;h=8f233268f3fe46d5cb5b1387f5868d81cc6af829;hp=673598790e1d1849fa74eeea806e13607aaabe47;hb=ffa00ac697dccce18dca8880ca7a14066521ac5c;hpb=51c3d3fb997c22e1ee828470413f1e84989e1f6c diff --git a/src/rrd_tool.c b/src/rrd_tool.c index 6735987..8f23326 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.3.8 Copyright by Tobi Oetiker, 1997-2009 + * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ @@ -49,7 +49,7 @@ void PrintUsage( const char *help_main = N_("RRDtool %s" - " Copyright 1997-2009 by Tobias Oetiker \n" + " Copyright 1997-2008 by Tobias Oetiker \n" " Compiled %s %s\n\n" "Usage: rrdtool [options] command command_options\n\n"); @@ -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\n\n"); + "\t\tresize, xport, flushcached\n\n"); const char *help_listremote = N_("Valid remote commands: quit, ls, cd, mkdir, pwd\n\n"); @@ -97,7 +97,8 @@ void PrintUsage( const char *help_update = N_("* update - update an RRD\n\n" "\trrdtool update filename\n" - "\t\t--template|-t ds-name:ds-name:...\n" + "\t\t[--template|-t ds-name:ds-name:...]\n" + "\t\t[--daemon
]\n" "\t\ttime|N:value[:value...]\n\n" "\t\tat-time@value[:value...]\n\n" "\t\t[ time:value[:value...] ..]\n\n"); @@ -106,7 +107,7 @@ void PrintUsage( N_("* updatev - a verbose version 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\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"); @@ -115,7 +116,13 @@ void PrintUsage( N_("* fetch - fetch data out of an RRD\n\n" "\trrdtool fetch filename.rrd CF\n" "\t\t[-r|--resolution resolution]\n" - "\t\t[-s|--start start] [-e|--end end]\n\n"); + "\t\t[-s|--start start] [-e|--end end]\n" + "\t\t[--daemon
]\n\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
]\n\n"); /* break up very large strings (help_graph, help_tune) for ISO C89 compliance*/ @@ -128,7 +135,7 @@ void PrintUsage( "\trrdtool graphv filename [-s|--start seconds] [-e|--end seconds]\n"); const char *help_graph1 = N_("\t\t[-x|--x-grid x-axis grid and label]\n" - "\t\t[-Y|--alt-y-grid]\n" + "\t\t[-Y|--alt-y-grid] [--full-size-mode]\n" "\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" @@ -136,7 +143,7 @@ void PrintUsage( "\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" - "\t\t[-g|--no-legend] [--full-size-mode]\n" + "\t\t[-g|--no-legend] [--daemon
]\n" "\t\t[-F|--force-rules-legend]\n" "\t\t[-j|--only-graph]\n"); const char *help_graph2 = N_("\t\t[-n|--font FONTTAG:size:font]\n" @@ -222,7 +229,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_UPDATEV, C_FLUSHCACHED }; int help_cmd = C_NONE; @@ -247,6 +254,8 @@ void PrintUsage( help_cmd = C_UPDATEV; else if (!strcmp(cmd, "fetch")) help_cmd = C_FETCH; + else if (!strcmp(cmd, "flushcached")) + help_cmd = C_FLUSHCACHED; else if (!strcmp(cmd, "graph")) help_cmd = C_GRAPH; else if (!strcmp(cmd, "graphv")) @@ -307,6 +316,9 @@ void PrintUsage( case C_FETCH: fputs(_(help_fetch), stdout); break; + case C_FLUSHCACHED: + fputs(_(help_flushcached), stdout); + break; case C_GRAPH: fputs(_(help_graph0), stdout); fputs(_(help_graph1), stdout); @@ -517,7 +529,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. */ @@ -550,6 +561,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); @@ -652,26 +664,7 @@ int HandleInputLine( else if (strcmp("last", argv[1]) == 0) printf("%ld\n", rrd_last(argc - 1, &argv[1])); else if (strcmp("lastupdate", argv[1]) == 0) { - time_t last_update; - char **ds_namv; - char **last_ds; - unsigned long ds_cnt, i; - - if (rrd_lastupdate(argc - 1, &argv[1], &last_update, - &ds_cnt, &ds_namv, &last_ds) == 0) { - for (i = 0; i < ds_cnt; i++) - printf(" %s", ds_namv[i]); - printf("\n\n"); - printf("%10lu:", last_update); - for (i = 0; i < ds_cnt; i++) { - printf(" %s", last_ds[i]); - free(last_ds[i]); - free(ds_namv[i]); - } - printf("\n"); - free(last_ds); - free(ds_namv); - } + rrd_lastupdate(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) @@ -820,6 +813,8 @@ int HandleInputLine( } else if (strcmp("tune", argv[1]) == 0) rrd_tune(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]); }