X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.c;h=24abcdce9c36a4ad445e4cc9ddd3bd8509fbdf45;hp=ea94ea14380fd0aebcfe5e0e43e551e3d51fe904;hb=d85e6bdfe82fdc4d16898df43f8a5371503816ae;hpb=19f031713115921bebf5949ce63926d66dd8c6a5 diff --git a/src/rrd_tool.c b/src/rrd_tool.c index ea94ea1..24abcdc 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -4,10 +4,12 @@ * rrd_tool.c Startup wrapper *****************************************************************************/ -#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H) +#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" @@ -205,7 +207,7 @@ void PrintUsage( 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[--enumds] [--json]\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 = @@ -414,6 +416,12 @@ int main( 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); @@ -534,7 +542,7 @@ int HandleInputLine( */ 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); } @@ -542,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); } @@ -562,7 +570,7 @@ int HandleInputLine( } if (argc > 1 && strcmp("pwd", argv[1]) == 0) { char *cwd; /* To hold current working dir on call to pwd */ - if (argc > 2) { + if (argc != 2) { printf("ERROR: invalid parameter count for pwd\n"); return (1); } @@ -576,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); } @@ -595,7 +603,7 @@ int HandleInputLine( 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); } @@ -677,7 +685,7 @@ int HandleInputLine( if (rrd_fetch (argc - 1, &argv[1], &start, &end, &step, &ds_cnt, &ds_namv, - &data) != -1) { + &data) == 0) { datai = data; printf(" "); for (i = 0; i < ds_cnt; i++) @@ -695,82 +703,19 @@ int HandleInputLine( free(data); } } else if (strcmp("xport", argv[1]) == 0) { - int xxsize; - unsigned long int j = 0; - time_t start, end, ti; - unsigned long step, col_cnt, row_cnt; - rrd_value_t *data, *ptr; - char **legend_v; - int enumds = 0; - int i; - size_t vtag_s = strlen(COL_DATA_TAG) + 10; - char *vtag = malloc(vtag_s); - - for (i = 2; i < argc; i++) { - if (strcmp("--enumds", argv[i]) == 0) - enumds = 1; - } - - if (rrd_xport - (argc - 1, &argv[1], &xxsize, &start, &end, &step, &col_cnt, - &legend_v, &data) != -1) { - char *old_locale = 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, - (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, (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, - META_COLS_TAG); - printf(" <%s>\n", LEGEND_TAG); - for (j = 0; j < col_cnt; j++) { - char *entry = NULL; - - entry = legend_v[j]; - printf(" <%s>%s\n", LEGEND_ENTRY_TAG, entry, - LEGEND_ENTRY_TAG); - free(entry); - } - free(legend_v); - printf(" \n", LEGEND_TAG); - printf(" \n", META_TAG); - 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); - 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); - } else { - printf("<%s>%0.10e", vtag, newval, vtag); - }; - ptr++; - } - printf("\n", DATA_ROW_TAG); - } - free(data); - printf(" \n", DATA_TAG); - printf("\n", ROOT_TAG); - setlocale(LC_NUMERIC, old_locale); - } - free(vtag); +#ifdef HAVE_RRD_GRAPH + time_t start, end; + unsigned long step, col_cnt; + rrd_value_t *data; + char **legend_v; + rrd_xport + (argc - 1, &argv[1], NULL, &start, &end, &step, &col_cnt, + &legend_v, &data); +#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*/ @@ -791,7 +736,7 @@ int HandleInputLine( } if (rrd_graph (argc - 1, &argv[1], &calcpr, &xsize, &ysize, NULL, &ymin, - &ymax) != -1) { + &ymax) == 0) { if (!tostdout && !imginfo) printf("%dx%d\n", xsize, ysize); if (calcpr) { @@ -804,7 +749,11 @@ 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]); @@ -812,11 +761,15 @@ int HandleInputLine( 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]); }