X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tune.c;h=1c72db7d2c9363a952768b71ab613df9cfd62823;hb=7769bc2e3878d617cacab27d0839adc5995979ad;hp=f675c8b24d92ec9f5524a696b67f543ca629d2dd;hpb=ad6f3441d407ca0c82b86b481f697ca913844d54;p=rrdtool.git diff --git a/src/rrd_tune.c b/src/rrd_tune.c index f675c8b..1c72db7 100644 --- a/src/rrd_tune.c +++ b/src/rrd_tune.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.2.99907080300 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * change header parameters of an rrd ***************************************************************************** @@ -42,6 +42,7 @@ #include "rrd_tool.h" #include "rrd_rpncalc.h" #include "rrd_hw.h" +#include int set_hwarg( rrd_t *rrd, @@ -104,6 +105,7 @@ int rrd_tune( while (1) { int option_index = 0; int opt; + char *old_locale = ""; opt = getopt_long(argc, argv, "h:i:a:d:r:p:n:w:f:x:y:z:v:b:", long_options, &option_index); @@ -113,14 +115,17 @@ int rrd_tune( optcnt++; switch (opt) { case 'h': + old_locale = setlocale(LC_NUMERIC, "C"); if ((matches = sscanf(optarg, DS_NAM_FMT ":%ld", ds_nam, &heartbeat)) != 2) { rrd_set_error("invalid arguments for heartbeat"); rrd_free(&rrd); rrd_close(rrd_file); + setlocale(LC_NUMERIC, old_locale); return -1; } + setlocale(LC_NUMERIC, old_locale); if ((ds = ds_match(&rrd, ds_nam)) == -1) { rrd_free(&rrd); rrd_close(rrd_file); @@ -130,13 +135,16 @@ int rrd_tune( break; case 'i': + old_locale = setlocale(LC_NUMERIC, "C"); if ((matches = sscanf(optarg, DS_NAM_FMT ":%lf", ds_nam, &min)) < 1) { rrd_set_error("invalid arguments for minimum ds value"); rrd_free(&rrd); rrd_close(rrd_file); + setlocale(LC_NUMERIC, old_locale); return -1; } + setlocale(LC_NUMERIC, old_locale); if ((ds = ds_match(&rrd, ds_nam)) == -1) { rrd_free(&rrd); rrd_close(rrd_file); @@ -149,13 +157,16 @@ int rrd_tune( break; case 'a': + old_locale = setlocale(LC_NUMERIC, "C"); if ((matches = sscanf(optarg, DS_NAM_FMT ":%lf", ds_nam, &max)) < 1) { rrd_set_error("invalid arguments for maximum ds value"); rrd_free(&rrd); rrd_close(rrd_file); + setlocale(LC_NUMERIC, old_locale); return -1; } + setlocale(LC_NUMERIC, old_locale); if ((ds = ds_match(&rrd, ds_nam)) == -1) { rrd_free(&rrd); rrd_close(rrd_file);