X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.c;h=8efd492c48570788f6b59b73192bd71e821d8320;hp=ee561d668293956d20eeb85a710fb8e2111b9d23;hb=35354e059a77479a7a135c1e4fc71c76523fd7c4;hpb=009ac7ac9dde1ba7c450b230b9118cff2cedc9f6 diff --git a/src/rrd_tool.c b/src/rrd_tool.c index ee561d6..8efd492 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,11 +1,24 @@ /***************************************************************************** - * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ +#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H) +#include "../win32/config.h" +#else +#ifdef HAVE_CONFIG_H +#include "../rrd_config.h" +#endif +#endif + #include "rrd_tool.h" #include "rrd_xport.h" +#include "rrd_i18n.h" + +#ifdef HAVE_LOCALE_H +#include +#endif void PrintUsage( char *cmd); @@ -32,182 +45,180 @@ void PrintUsage( char *cmd) { - char help_main[] = - "RRDtool " PACKAGE_VERSION - " Copyright 1997-2007 by Tobias Oetiker \n" - " Compiled " __DATE__ " " __TIME__ "\n\n" - "Usage: rrdtool [options] command command_options\n\n"; - - char help_list[] = - "Valid commands: create, update, updatev, graph, dump, restore,\n" - "\t\tlast, lastupdate, first, info, fetch, tune,\n" - "\t\tresize, xport\n\n"; - - char help_listremote[] = - "Valid remote commands: quit, ls, cd, mkdir, pwd\n\n"; - - - char help_create[] = - "* create - create a new RRD\n\n" - "\trrdtool create filename [--start|-b start time]\n" - "\t\t[--step|-s step]\n" - "\t\t[DS:ds-name:DST:dst arguments]\n" - "\t\t[RRA:CF:cf arguments]\n\n"; - - char help_dump[] = - "* dump - dump an RRD to XML\n\n" - "\trrdtool dump filename.rrd >filename.xml\n\n"; - - char help_info[] = - "* info - returns the configuration and status of the RRD\n\n" - "\trrdtool info filename.rrd\n\n"; - - char help_restore[] = - "* restore - restore an RRD file from its XML form\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" - "\trrdtool last filename.rrd\n\n"; - - char help_lastupdate[] = - "* lastupdate - returns the most recent datum stored for\n" - " each DS in an RRD\n\n" "\trrdtool lastupdate filename.rrd\n\n"; - - char help_first[] = - "* first - show first update time for RRA within an RRD\n\n" - "\trrdtool first filename.rrd [--rraindex number]\n\n"; - - char help_update[] = - "* update - update an RRD\n\n" - "\trrdtool update 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_updatev[] = - "* 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\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" - "\trrdtool fetch filename.rrd CF\n" - "\t\t[-r|--resolution resolution]\n" - "\t\t[-s|--start start] [-e|--end end]\n\n"; + const char *help_main = + N_("RRDtool %s" + " Copyright 1997-2008 by Tobias Oetiker \n" + " Compiled %s %s\n\n" + "Usage: rrdtool [options] command command_options\n\n"); + + const char *help_list = + N_ + ("Valid commands: create, update, updatev, graph, graphv, dump, restore,\n" + "\t\tlast, lastupdate, first, info, fetch, tune,\n" + "\t\tresize, xport\n\n"); + + const char *help_listremote = + N_("Valid remote commands: quit, ls, cd, mkdir, pwd\n\n"); + + + const char *help_create = + N_("* create - create a new RRD\n\n" + "\trrdtool create filename [--start|-b start time]\n" + "\t\t[--step|-s step]\n" + "\t\t[DS:ds-name:DST:dst arguments]\n" + "\t\t[RRA:CF:cf arguments]\n\n"); + + const char *help_dump = + N_("* dump - dump an RRD to XML\n\n" + "\trrdtool dump filename.rrd >filename.xml\n\n"); + + const char *help_info = + N_("* info - returns the configuration and status of the RRD\n\n" + "\trrdtool info filename.rrd\n\n"); + + const char *help_restore = + N_("* restore - restore an RRD file from its XML form\n\n" + "\trrdtool restore [--range-check|-r] [--force-overwrite|-f] filename.xml filename.rrd\n\n"); + + const char *help_last = + N_("* last - show last update time for RRD\n\n" + "\trrdtool last filename.rrd\n\n"); + + const char *help_lastupdate = + N_("* lastupdate - returns the most recent datum stored for\n" + " each DS in an RRD\n\n" "\trrdtool lastupdate filename.rrd\n\n"); + + const char *help_first = + N_("* first - show first update time for RRA within an RRD\n\n" + "\trrdtool first filename.rrd [--rraindex number]\n\n"); + + 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\ttime|N:value[:value...]\n\n" + "\t\tat-time@value[:value...]\n\n" + "\t\t[ time:value[:value...] ..]\n\n"); + + const char *help_updatev = + 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\ttime|N:value[:value...]\n\n" + "\t\tat-time@value[:value...]\n\n" + "\t\t[ time:value[:value...] ..]\n\n"); + + const char *help_fetch = + 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"); /* break up very large strings (help_graph, help_tune) for ISO C89 compliance*/ - char help_graph1[] = - "* graph - generate a graph from one or several RRD\n\n" - "\trrdtool graph filename [-s|--start seconds] [-e|--end seconds]\n" - "\t\t[-x|--x-grid x-axis grid and label]\n" - "\t\t[-Y|--alt-y-grid]\n" - "\t\t[-y|--y-grid y-axis grid and label]\n" - "\t\t[-v|--vertical-label string] [-w|--width pixels]\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" - "\t\t[-g|--no-legend]\n" - "\t\t[-F|--force-rules-legend]\n" "\t\t[-j|--only-graph]\n"; - char help_graph2[] = - "\t\t[-n|--font FONTTAG:size:font]\n" - "\t\t[-m|--zoom factor]\n" - "\t\t[-A|--alt-autoscale]\n" - "\t\t[-M|--alt-autoscale-max]\n" - "\t\t[-R|--font-render-mode {normal,light,mono}]\n" - "\t\t[-B|--font-smoothing-threshold size]\n" - "\t\t[-E|--slope-mode]\n" - "\t\t[-N|--no-gridfit]\n" - "\t\t[-X|--units-exponent value]\n" - "\t\t[-L|--units-length value]\n" - "\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[-W|--watermark string]\n" "\t\t[DEF:vname=rrd:ds-name:CF]\n"; - char help_graph3[] = - "\t\t[CDEF:vname=rpn-expression]\n" - "\t\t[VDEF:vdefname=rpn-expression]\n" - "\t\t[PRINT:vdefname:format]\n" - "\t\t[GPRINT:vdefname:format]\n" - "\t\t[COMMENT:text]\n" - "\t\t[SHIFT:vname:offset]\n" - "\t\t[TICK:vname#rrggbb[aa][:[fraction][:legend]]]\n" - "\t\t[HRULE:value#rrggbb[aa][:legend]]\n" - "\t\t[VRULE:value#rrggbb[aa][:legend]]\n" - "\t\t[LINE[width]:vname[#rrggbb[aa][:[legend][:STACK]]]]\n" - "\t\t[AREA:vname[#rrggbb[aa][:[legend][:STACK]]]]\n" - "\t\t[PRINT:vname:CF:format] (deprecated)\n" - "\t\t[GPRINT:vname:CF:format] (deprecated)\n" - "\t\t[STACK:vname[#rrggbb[aa][:legend]]] (deprecated)\n\n"; - - char help_tune1[] = - " * tune - Modify some basic properties of an RRD\n\n" - "\trrdtool tune filename\n" - "\t\t[--heartbeat|-h ds-name:heartbeat]\n" - "\t\t[--data-source-type|-d ds-name:DST]\n" - "\t\t[--data-source-rename|-r old-name:new-name]\n" - "\t\t[--minimum|-i ds-name:min] [--maximum|-a ds-name:max]\n" - "\t\t[--deltapos scale-value] [--deltaneg scale-value]\n" - "\t\t[--failure-threshold integer]\n" - "\t\t[--window-length integer]\n" - "\t\t[--alpha adaptation-parameter]\n"; - char help_tune2[] = - " * tune - Modify some basic properties of an RRD\n\n" - "\t\t[--beta adaptation-parameter]\n" - "\t\t[--gamma adaptation-parameter]\n" - "\t\t[--gamma-deviation adaptation-parameter]\n" - "\t\t[--aberrant-reset ds-name]\n\n"; - - char help_resize[] = - " * resize - alter the length of one of the RRAs in an RRD\n\n" - "\trrdtool resize filename rranum GROW|SHRINK rows\n\n"; - - char help_xport[] = - "* xport - generate XML dump from one or several RRD\n\n" - "\trrdtool xport [-s|--start seconds] [-e|--end seconds]\n" - "\t\t[-m|--maxrows rows]\n" - "\t\t[--step seconds]\n" - "\t\t[--enumds]\n" - "\t\t[DEF:vname=rrd:ds-name:CF]\n" - "\t\t[CDEF:vname=rpn-expression]\n" "\t\t[XPORT:vname:legend]\n\n"; - - char help_quit[] = - " * quit - closing a session in remote mode\n\n" "\trrdtool quit\n\n"; - - char help_ls[] = - " * ls - lists all *.rrd files in current directory\n\n" - "\trrdtool ls\n\n"; - - char help_cd[] = - " * cd - changes the current directory\n\n" - "\trrdtool cd new directory\n\n"; - - char help_mkdir[] = - " * mkdir - creates a new directory\n\n" - "\trrdtool mkdir newdirectoryname\n\n"; - - char help_pwd[] = - " * pwd - returns the current working directory\n\n" - "\trrdtool pwd\n\n"; - - char help_lic[] = - "RRDtool is distributed under the Terms of the GNU General\n" - "Public License Version 2. (www.gnu.org/copyleft/gpl.html)\n\n" - "For more information read the RRD manpages\n\n"; - + const char *help_graph0 = + N_("* graph - generate a graph from one or several RRD\n\n" + "\trrdtool graph filename [-s|--start seconds] [-e|--end seconds]\n"); + const char *help_graphv0 = + N_("* graphv - generate a graph from one or several RRD\n" + " with meta data printed before the graph\n\n" + "\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|--y-grid y-axis grid and label]\n" + "\t\t[-v|--vertical-label string] [-w|--width pixels]\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" + "\t\t[-g|--no-legend]\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" + "\t\t[-m|--zoom factor]\n" + "\t\t[-A|--alt-autoscale]\n" + "\t\t[-M|--alt-autoscale-max]\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" + "\t\t[-E|--slope-mode]\n" + "\t\t[-N|--no-gridfit]\n" + "\t\t[-X|--units-exponent value]\n" + "\t\t[-L|--units-length value]\n" + "\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[-W|--watermark string]\n" + "\t\t[DEF:vname=rrd:ds-name:CF]\n"); + const char *help_graph3 = + N_("\t\t[CDEF:vname=rpn-expression]\n" + "\t\t[VDEF:vdefname=rpn-expression]\n" + "\t\t[PRINT:vdefname:format]\n" + "\t\t[GPRINT:vdefname:format]\n" "\t\t[COMMENT:text]\n" + "\t\t[SHIFT:vname:offset]\n" + "\t\t[TICK:vname#rrggbb[aa][:[fraction][:legend]]]\n" + "\t\t[HRULE:value#rrggbb[aa][:legend]]\n" + "\t\t[VRULE:value#rrggbb[aa][:legend]]\n" + "\t\t[LINE[width]:vname[#rrggbb[aa][:[legend][:STACK]]]]\n" + "\t\t[AREA:vname[#rrggbb[aa][:[legend][:STACK]]]]\n" + "\t\t[PRINT:vname:CF:format] (deprecated)\n" + "\t\t[GPRINT:vname:CF:format] (deprecated)\n" + "\t\t[STACK:vname[#rrggbb[aa][:legend]]] (deprecated)\n\n"); + const char *help_tune1 = + N_(" * tune - Modify some basic properties of an RRD\n\n" + "\trrdtool tune filename\n" + "\t\t[--heartbeat|-h ds-name:heartbeat]\n" + "\t\t[--data-source-type|-d ds-name:DST]\n" + "\t\t[--data-source-rename|-r old-name:new-name]\n" + "\t\t[--minimum|-i ds-name:min] [--maximum|-a ds-name:max]\n" + "\t\t[--deltapos scale-value] [--deltaneg scale-value]\n" + "\t\t[--failure-threshold integer]\n" + "\t\t[--window-length integer]\n" + "\t\t[--alpha adaptation-parameter]\n"); + const char *help_tune2 = + N_(" * tune - Modify some basic properties of an RRD\n\n" + "\t\t[--beta adaptation-parameter]\n" + "\t\t[--gamma adaptation-parameter]\n" + "\t\t[--gamma-deviation adaptation-parameter]\n" + "\t\t[--aberrant-reset ds-name]\n\n"); + const char *help_resize = + N_ + (" * resize - alter the length of one of the RRAs in an RRD\n\n" + "\trrdtool resize filename rranum GROW|SHRINK rows\n\n"); + const char *help_xport = + N_("* xport - generate XML dump from one or several RRD\n\n" + "\trrdtool xport [-s|--start seconds] [-e|--end seconds]\n" + "\t\t[-m|--maxrows rows]\n" "\t\t[--step seconds]\n" + "\t\t[--enumds]\n" "\t\t[DEF:vname=rrd:ds-name:CF]\n" + "\t\t[CDEF:vname=rpn-expression]\n" + "\t\t[XPORT:vname:legend]\n\n"); + const char *help_quit = + N_(" * quit - closing a session in remote mode\n\n" + "\trrdtool quit\n\n"); + const char *help_ls = + N_(" * ls - lists all *.rrd files in current directory\n\n" + "\trrdtool ls\n\n"); + const char *help_cd = + N_(" * cd - changes the current directory\n\n" + "\trrdtool cd new directory\n\n"); + const char *help_mkdir = + N_(" * mkdir - creates a new directory\n\n" + "\trrdtool mkdir newdirectoryname\n\n"); + const char *help_pwd = + N_(" * pwd - returns the current working directory\n\n" + "\trrdtool pwd\n\n"); + const char *help_lic = + N_("RRDtool is distributed under the Terms of the GNU General\n" + "Public License Version 2. (www.gnu.org/copyleft/gpl.html)\n\n" + "For more information read the RRD manpages\n\n"); enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST, - C_LASTUPDATE, C_FIRST, C_UPDATE, C_FETCH, C_GRAPH, C_TUNE, + 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 }; - int help_cmd = C_NONE; if (cmd) { @@ -233,6 +244,8 @@ void PrintUsage( help_cmd = C_FETCH; else if (!strcmp(cmd, "graph")) help_cmd = C_GRAPH; + else if (!strcmp(cmd, "graphv")) + help_cmd = C_GRAPHV; else if (!strcmp(cmd, "tune")) help_cmd = C_TUNE; else if (!strcmp(cmd, "resize")) @@ -250,76 +263,84 @@ void PrintUsage( else if (!strcmp(cmd, "pwd")) help_cmd = C_PWD; } - fputs(help_main, stdout); + fprintf(stdout, _(help_main), PACKAGE_VERSION, __DATE__, __TIME__); + fflush(stdout); switch (help_cmd) { case C_NONE: - fputs(help_list, stdout); + fputs(_(help_list), stdout); if (RemoteMode) { - fputs(help_listremote, stdout); + fputs(_(help_listremote), stdout); } break; case C_CREATE: - fputs(help_create, stdout); + fputs(_(help_create), stdout); break; case C_DUMP: - fputs(help_dump, stdout); + fputs(_(help_dump), stdout); break; case C_INFO: - fputs(help_info, stdout); + fputs(_(help_info), stdout); break; case C_RESTORE: - fputs(help_restore, stdout); + fputs(_(help_restore), stdout); break; case C_LAST: - fputs(help_last, stdout); + fputs(_(help_last), stdout); break; case C_LASTUPDATE: - fputs(help_lastupdate, stdout); + fputs(_(help_lastupdate), stdout); break; case C_FIRST: - fputs(help_first, stdout); + fputs(_(help_first), stdout); break; case C_UPDATE: - fputs(help_update, stdout); + fputs(_(help_update), stdout); break; case C_UPDATEV: - fputs(help_updatev, stdout); + fputs(_(help_updatev), stdout); break; case C_FETCH: - fputs(help_fetch, stdout); + fputs(_(help_fetch), stdout); break; case C_GRAPH: - fputs(help_graph1, stdout); - fputs(help_graph2, stdout); - fputs(help_graph3, stdout); + fputs(_(help_graph0), stdout); + fputs(_(help_graph1), stdout); + fputs(_(help_graph2), stdout); + fputs(_(help_graph3), stdout); + break; + case C_GRAPHV: + fputs(_(help_graphv0), stdout); + fputs(_(help_graph1), stdout); + fputs(_(help_graph2), stdout); + fputs(_(help_graph3), stdout); break; case C_TUNE: - fputs(help_tune1, stdout); - fputs(help_tune2, stdout); + fputs(_(help_tune1), stdout); + fputs(_(help_tune2), stdout); break; case C_RESIZE: - fputs(help_resize, stdout); + fputs(_(help_resize), stdout); break; case C_XPORT: - fputs(help_xport, stdout); + fputs(_(help_xport), stdout); break; case C_QUIT: - fputs(help_quit, stdout); + fputs(_(help_quit), stdout); break; case C_LS: - fputs(help_ls, stdout); + fputs(_(help_ls), stdout); break; case C_CD: - fputs(help_cd, stdout); + fputs(_(help_cd), stdout); break; case C_MKDIR: - fputs(help_mkdir, stdout); + fputs(_(help_mkdir), stdout); break; case C_PWD: - fputs(help_pwd, stdout); + fputs(_(help_pwd), stdout); break; } - fputs(help_lic, stdout); + fputs(_(help_lic), stdout); } static char *fgetslong( @@ -364,6 +385,15 @@ int main( #ifdef MUST_DISABLE_FPMASK fpsetmask(0); #endif +#ifdef HAVE_LOCALE_H + 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) { PrintUsage(""); return 0; @@ -446,7 +476,6 @@ int main( / 1000000.0); #else printf("OK\n"); - #endif } } @@ -484,7 +513,6 @@ int HandleInputLine( /* Reset errno to 0 before we start. */ errno = 0; - if (RemoteMode) { if (argc > 1 && strcmp("quit", argv[1]) == 0) { if (argc > 2) { @@ -593,40 +621,15 @@ int HandleInputLine( else if (strcmp("dump", argv[1]) == 0) rrd_dump(argc - 1, &argv[1]); else if (strcmp("info", argv[1]) == 0 || strcmp("updatev", argv[1]) == 0) { - info_t *data, *save; + rrd_info_t *data; 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); - free(data->key); - - switch (data->type) { - case RD_I_VAL: - if (isnan(data->value.u_val)) - printf("NaN"); - else - printf("%0.10e", data->value.u_val); - break; - 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); - break; - } - data = data->next; - free(save); - printf("\n"); - } - free(data); + rrd_info_print(data); + rrd_info_free(data); } else if (strcmp("--version", argv[1]) == 0 || @@ -634,7 +637,7 @@ int HandleInputLine( strcmp("v", argv[1]) == 0 || strcmp("-v", argv[1]) == 0 || strcmp("-version", argv[1]) == 0) printf("RRDtool " PACKAGE_VERSION - " Copyright by Tobi Oetiker, 1997-2005 (%f)\n", + " Copyright by Tobi Oetiker, 1997-2008 (%f)\n", rrd_version()); else if (strcmp("restore", argv[1]) == 0) rrd_restore(argc - 1, &argv[1]); @@ -718,10 +721,11 @@ int HandleInputLine( XML_ENCODING); printf("<%s>\n", ROOT_TAG); printf(" <%s>\n", META_TAG); - printf(" <%s>%lu\n", META_START_TAG, start + step, - META_START_TAG); + printf(" <%s>%lu\n", META_START_TAG, + (unsigned long) start + step, META_START_TAG); printf(" <%s>%lu\n", META_STEP_TAG, step, META_STEP_TAG); - printf(" <%s>%lu\n", META_END_TAG, end, META_END_TAG); + printf(" <%s>%lu\n", META_END_TAG, (unsigned long) end, + META_END_TAG); printf(" <%s>%lu\n", META_ROWS_TAG, row_cnt, META_ROWS_TAG); printf(" <%s>%lu\n", META_COLS_TAG, col_cnt, @@ -746,10 +750,10 @@ int HandleInputLine( rrd_value_t newval = DNAN; if (enumds == 1) + snprintf(vtag, vtag_s, "%s%lu", COL_DATA_TAG, j); else snprintf(vtag, vtag_s, "%s", COL_DATA_TAG); - newval = *ptr; if (isnan(newval)) { printf("<%s>NaN", vtag, vtag); @@ -799,6 +803,15 @@ int HandleInputLine( } } + } else if (strcmp("graphv", argv[1]) == 0) { + rrd_info_t *grinfo = NULL; /* 1 to distinguish it from the NULL that rrd_graph sends in */ + + grinfo = rrd_graph_v(argc - 1, &argv[1]); + if (grinfo) { + rrd_info_print(grinfo); + rrd_info_free(grinfo); + } + } else if (strcmp("tune", argv[1]) == 0) rrd_tune(argc - 1, &argv[1]); else { @@ -858,7 +871,6 @@ int CreateArgs( /* sikp leading blanks */ while (*aLine && *aLine <= ' ') aLine++; - pargv[0] = pName; argc = 1; getP = aLine; @@ -901,7 +913,6 @@ int CreateArgs( } *putP = '\0'; - if (Quote) return -1; else