X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.c;h=eedbf4a9353367199a38a48be62d206540ff8fff;hp=b493cba78e352d305f5bba277cac1aa39ed3e058;hb=ec2afe5e94d9fcd72bb58e572f0251c7557325f7;hpb=674dee5af23a9cf9488f11880368c64a5ad70026 diff --git a/src/rrd_tool.c b/src/rrd_tool.c index b493cba..eedbf4a 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.18 Copyright by Tobi Oetiker, 1997-2006 + * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ @@ -29,7 +29,7 @@ void PrintUsage(char *cmd) char help_list[] = "Valid commands: create, update, updatev, graph, dump, restore,\n" "\t\tlast, lastupdate, first, info, fetch, tune,\n" - " resize, xport\n\n"; + "\t\tresize, xport\n\n"; char help_listremote[] = "Valid remote commands: quit, ls, cd, mkdir, pwd\n\n"; @@ -689,8 +689,8 @@ int HandleInputLine(int argc, char **argv, FILE* out) char **legend_v; int enumds = 0; int i; - char *vtag = NULL; - vtag = malloc( strlen(COL_DATA_TAG)+10); + 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; @@ -724,9 +724,9 @@ int HandleInputLine(int argc, char **argv, FILE* out) for (j = 0; j < col_cnt; j++) { rrd_value_t newval = DNAN; if (enumds == 1) - snprintf(vtag,sizeof(vtag),"%s%lu", COL_DATA_TAG, j); + snprintf(vtag,vtag_s,"%s%lu", COL_DATA_TAG, j); else - snprintf(vtag,sizeof(vtag),"%s",COL_DATA_TAG); + snprintf(vtag,vtag_s,"%s",COL_DATA_TAG); newval = *ptr; if(isnan(newval)){