X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.c;h=d46d1959901f04c0e21affeddae2d68543b5d073;hp=ee561d668293956d20eeb85a710fb8e2111b9d23;hb=a3f32f5a1f6c5c58a3028aca1e4b6ae5472e76b6;hpb=009ac7ac9dde1ba7c450b230b9118cff2cedc9f6 diff --git a/src/rrd_tool.c b/src/rrd_tool.c index ee561d6..d46d195 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,11 +1,27 @@ /***************************************************************************** - * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ +#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H) +#include "../win32/config.h" +#include +#include +#include +#include +#else +#ifdef HAVE_CONFIG_H +#include "../rrd_config.h" +#endif +#endif + #include "rrd_tool.h" #include "rrd_xport.h" +#include "rrd_i18n.h" + +#include + void PrintUsage( char *cmd); @@ -14,7 +30,6 @@ int CountArgs( int CreateArgs( char *, char *, - int, char **); int HandleInputLine( int, @@ -32,182 +47,194 @@ 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-2009 by Tobias Oetiker \n" + " Compiled %s %s\n\n" + "Usage: rrdtool [options] command command_options\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, flushcached\n"); + + const char *help_listremote = + N_("Valid remote commands: quit, ls, cd, mkdir, pwd\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[--no-overwrite|-O]\n" + "\t\t[DS:ds-name:DST:dst arguments]\n" + "\t\t[RRA:CF:cf arguments]\n"); + + const char *help_dump = + N_("* dump - dump an RRD to XML\n\n" + "\trrdtool dump filename.rrd >filename.xml\n"); + + const char *help_info = + N_("* info - returns the configuration and status of the RRD\n\n" + "\trrdtool info filename.rrd\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"); + + const char *help_last = + N_("* last - show last update time for RRD\n\n" + "\trrdtool last filename.rrd\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"); + + const char *help_first = + N_("* first - show first update time for RRA within an RRD\n\n" + "\trrdtool first filename.rrd [--rraindex number]\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\t[--daemon
]\n" + "\t\ttime|N:value[:value...]\n\n" + "\t\tat-time@value[:value...]\n\n" + "\t\t[ time:value[:value...] ..]\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"); + + 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" + "\t\t[--daemon
]\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"); /* 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] [--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" + "\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" + "\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" + "\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" + "\t\t[-E|--slope-mode]\n" + "\t\t[-P|--pango-markup]\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]]\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 = + 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[TEXTALIGN:{left|right|justified|center}]\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"); + 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_("\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"); + 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"); + 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"); + const char *help_quit = + N_(" * quit - closing a session in remote mode\n\n" + "\trrdtool quit\n"); + const char *help_ls = + N_(" * ls - lists all *.rrd files in current directory\n\n" + "\trrdtool ls\n"); + const char *help_cd = + N_(" * cd - changes the current directory\n\n" + "\trrdtool cd new directory\n"); + const char *help_mkdir = + N_(" * mkdir - creates a new directory\n\n" + "\trrdtool mkdir newdirectoryname\n"); + const char *help_pwd = + N_(" * pwd - returns the current working directory\n\n" + "\trrdtool pwd\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"); 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 + C_UPDATEV, C_FLUSHCACHED }; - int help_cmd = C_NONE; if (cmd) { @@ -231,8 +258,12 @@ 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")) + help_cmd = C_GRAPHV; else if (!strcmp(cmd, "tune")) help_cmd = C_TUNE; else if (!strcmp(cmd, "resize")) @@ -250,76 +281,87 @@ 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); + puts(_(help_list)); if (RemoteMode) { - fputs(help_listremote, stdout); + puts(_(help_listremote)); } break; case C_CREATE: - fputs(help_create, stdout); + puts(_(help_create)); break; case C_DUMP: - fputs(help_dump, stdout); + puts(_(help_dump)); break; case C_INFO: - fputs(help_info, stdout); + puts(_(help_info)); break; case C_RESTORE: - fputs(help_restore, stdout); + puts(_(help_restore)); break; case C_LAST: - fputs(help_last, stdout); + puts(_(help_last)); break; case C_LASTUPDATE: - fputs(help_lastupdate, stdout); + puts(_(help_lastupdate)); break; case C_FIRST: - fputs(help_first, stdout); + puts(_(help_first)); break; case C_UPDATE: - fputs(help_update, stdout); + puts(_(help_update)); break; case C_UPDATEV: - fputs(help_updatev, stdout); + puts(_(help_updatev)); break; case C_FETCH: - fputs(help_fetch, stdout); + puts(_(help_fetch)); + break; + case C_FLUSHCACHED: + puts(_(help_flushcached)); break; case C_GRAPH: - fputs(help_graph1, stdout); - fputs(help_graph2, stdout); - fputs(help_graph3, stdout); + puts(_(help_graph0)); + puts(_(help_graph1)); + puts(_(help_graph2)); + puts(_(help_graph3)); + break; + case C_GRAPHV: + puts(_(help_graphv0)); + puts(_(help_graph1)); + puts(_(help_graph2)); + puts(_(help_graph3)); break; case C_TUNE: - fputs(help_tune1, stdout); - fputs(help_tune2, stdout); + puts(_(help_tune1)); + puts(_(help_tune2)); break; case C_RESIZE: - fputs(help_resize, stdout); + puts(_(help_resize)); break; case C_XPORT: - fputs(help_xport, stdout); + puts(_(help_xport)); break; case C_QUIT: - fputs(help_quit, stdout); + puts(_(help_quit)); break; case C_LS: - fputs(help_ls, stdout); + puts(_(help_ls)); break; case C_CD: - fputs(help_cd, stdout); + puts(_(help_cd)); break; case C_MKDIR: - fputs(help_mkdir, stdout); + puts(_(help_mkdir)); break; case C_PWD: - fputs(help_pwd, stdout); + puts(_(help_pwd)); break; } - fputs(help_lic, stdout); + puts(_(help_lic)); } static char *fgetslong( @@ -343,11 +385,16 @@ static char *fgetslong( return *aLinePtr = linebuf; bufsize += MAX_LENGTH; if (!(linebuf = realloc(linebuf, bufsize))) { + free(linebuf); perror("fgetslong: realloc"); exit(1); } } - return *aLinePtr = linebuf[0] ? linebuf : 0; + if (linebuf[0]){ + return *aLinePtr = linebuf; + } + free(linebuf); + return *aLinePtr = 0; } int main( @@ -364,6 +411,21 @@ int main( #ifdef MUST_DISABLE_FPMASK fpsetmask(0); #endif + + /* initialize locale settings + according to localeconv(3) */ + setlocale(LC_ALL, ""); + +#if defined(WIN32) && !defined(__CYGWIN__) + setmode(fileno(stdout), O_BINARY); + setmode(fileno(stdin), O_BINARY); +#endif + + +#if defined(HAVE_LIBINTL_H) && defined(BUILD_LIBINTL) + bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); + textdomain(GETTEXT_PACKAGE); +#endif if (argc == 1) { PrintUsage(""); return 0; @@ -389,11 +451,8 @@ int main( == 0) { #ifdef HAVE_CHROOT - chroot(argv[2]); - if (errno != 0) { - fprintf(stderr, - "ERROR: can't change root to '%s' errno=%d\n", - argv[2], errno); + if (chroot(argv[2]) != 0){ + fprintf(stderr, "ERROR: chroot %s: %s\n", argv[2],rrd_strerror(errno)); exit(errno); } ChangeRoot = 1; @@ -409,29 +468,28 @@ int main( } } if (strcmp(firstdir, "")) { - chdir(firstdir); - if (errno != 0) { - fprintf(stderr, "ERROR: %s\n", rrd_strerror(errno)); + if (chdir(firstdir) != 0){ + fprintf(stderr, "ERROR: chdir %s %s\n", firstdir,rrd_strerror(errno)); exit(errno); } } while (fgetslong(&aLine, stdin)) { + char *aLineOrig = aLine; if ((argc = CountArgs(aLine)) == 0) { + free(aLine); printf("ERROR: not enough arguments\n"); + continue; } if ((myargv = (char **) malloc((argc + 1) * sizeof(char *))) == NULL) { perror("malloc"); exit(1); } - if ((argc = CreateArgs(argv[0], aLine, argc, myargv)) < 0) { + if ((argc = CreateArgs(argv[0], aLine, myargv)) < 0) { printf("ERROR: creating arguments\n"); } else { - int ret = HandleInputLine(argc, myargv, stdout); - - free(myargv); - if (ret == 0) { + if ( HandleInputLine(argc, myargv, stdout) == 0 ){ #if HAVE_GETRUSAGE getrusage(RUSAGE_SELF, &myusage); gettimeofday(¤ttime, NULL); @@ -446,12 +504,12 @@ int main( / 1000000.0); #else printf("OK\n"); - #endif } } fflush(stdout); /* this is important for pipes to work */ - free(aLine); + free(myargv); + free(aLineOrig); } } else if (argc == 2) { PrintUsage(argv[1]); @@ -479,15 +537,12 @@ 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. */ - errno = 0; - if (RemoteMode) { if (argc > 1 && strcmp("quit", argv[1]) == 0) { - if (argc > 2) { + if (argc != 2) { printf("ERROR: invalid parameter count for quit\n"); return (1); } @@ -495,7 +550,7 @@ int HandleInputLine( } #if defined(HAVE_OPENDIR) && defined(HAVE_READDIR) && defined(HAVE_CHDIR) if (argc > 1 && strcmp("cd", argv[1]) == 0) { - if (argc > 3) { + if (argc != 3) { printf("ERROR: invalid parameter count for cd\n"); return (1); } @@ -507,21 +562,21 @@ int HandleInputLine( return (1); } #endif - chdir(argv[2]); - if (errno != 0) { - printf("ERROR: %s\n", rrd_strerror(errno)); + if (chdir(argv[2]) != 0){ + printf("ERROR: chdir %s %s\n", argv[2], rrd_strerror(errno)); return (1); } return (0); } if (argc > 1 && strcmp("pwd", argv[1]) == 0) { - if (argc > 2) { + char *cwd; /* To hold current working dir on call to pwd */ + if (argc != 2) { printf("ERROR: invalid parameter count for pwd\n"); return (1); } cwd = getcwd(NULL, MAXPATH); if (cwd == NULL) { - printf("ERROR: %s\n", rrd_strerror(errno)); + printf("ERROR: getcwd %s\n", rrd_strerror(errno)); return (1); } printf("%s\n", cwd); @@ -529,7 +584,7 @@ int HandleInputLine( return (0); } if (argc > 1 && strcmp("mkdir", argv[1]) == 0) { - if (argc > 3) { + if (argc != 3) { printf("ERROR: invalid parameter count for mkdir\n"); return (1); } @@ -541,15 +596,14 @@ int HandleInputLine( return (1); } #endif - mkdir(argv[2], 0777); - if (errno != 0) { - printf("ERROR: %s\n", rrd_strerror(errno)); + if(mkdir(argv[2], 0777)!=0){ + printf("ERROR: mkdir %s: %s\n", argv[2],rrd_strerror(errno)); return (1); } return (0); } if (argc > 1 && strcmp("ls", argv[1]) == 0) { - if (argc > 2) { + if (argc != 2) { printf("ERROR: invalid parameter count for ls\n"); return (1); } @@ -571,7 +625,7 @@ int HandleInputLine( } closedir(curdir); } else { - printf("ERROR: %s\n", rrd_strerror(errno)); + printf("ERROR: opendir .: %s\n", rrd_strerror(errno)); return (errno); } return (0); @@ -593,40 +647,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 +663,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]); @@ -643,26 +672,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) @@ -693,6 +703,7 @@ int HandleInputLine( free(data); } } else if (strcmp("xport", argv[1]) == 0) { +#ifdef HAVE_RRD_GRAPH int xxsize; unsigned long int j = 0; time_t start, end, ti; @@ -712,16 +723,19 @@ int HandleInputLine( if (rrd_xport (argc - 1, &argv[1], &xxsize, &start, &end, &step, &col_cnt, &legend_v, &data) != -1) { + char *old_locale = setlocale(LC_NUMERIC,NULL); + setlocale(LC_NUMERIC, "C"); row_cnt = (end - start) / step; ptr = data; printf("\n\n", 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>%lld\n", META_START_TAG, + (long long int) 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>%lld\n", META_END_TAG, (long long int) 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, @@ -741,15 +755,15 @@ int HandleInputLine( printf(" <%s>\n", DATA_TAG); for (ti = start + step; ti <= end; ti += step) { printf(" <%s>", DATA_ROW_TAG); - printf("<%s>%lu", COL_TIME_TAG, ti, COL_TIME_TAG); + printf("<%s>%lld", COL_TIME_TAG, (long long int)ti, COL_TIME_TAG); for (j = 0; j < col_cnt; j++) { 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); @@ -763,9 +777,14 @@ int HandleInputLine( free(data); printf(" \n", DATA_TAG); printf("\n", ROOT_TAG); + setlocale(LC_NUMERIC, old_locale); } free(vtag); +#else + rrd_set_error("the instance of rrdtool has been compiled without graphics"); +#endif } else if (strcmp("graph", argv[1]) == 0) { +#ifdef HAVE_RRD_GRAPH char **calcpr; #ifdef notused /*XXX*/ @@ -799,8 +818,27 @@ int HandleInputLine( } } +#else + rrd_set_error("the instance of rrdtool has been compiled without graphics"); +#endif + } else if (strcmp("graphv", argv[1]) == 0) { +#ifdef HAVE_RRD_GRAPH + 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 + rrd_set_error("the instance of rrdtool has been compiled without graphics"); +#endif } else if (strcmp("tune", argv[1]) == 0) rrd_tune(argc - 1, &argv[1]); +#ifndef WIN32 + else if (strcmp("flushcached", argv[1]) == 0) + rrd_flushcached(argc - 1, &argv[1]); +#endif else { rrd_set_error("unknown function '%s'", argv[1]); } @@ -840,7 +878,6 @@ int CountArgs( int CreateArgs( char *pName, char *aLine, - int argc, char **argv) { char *getP, *putP; @@ -848,6 +885,7 @@ int CreateArgs( char Quote = 0; int inArg = 0; int len; + int argc = 1; len = strlen(aLine); /* remove trailing space and newlines */ @@ -858,7 +896,6 @@ int CreateArgs( /* sikp leading blanks */ while (*aLine && *aLine <= ' ') aLine++; - pargv[0] = pName; argc = 1; getP = aLine; @@ -901,7 +938,6 @@ int CreateArgs( } *putP = '\0'; - if (Quote) return -1; else