diff --git a/src/rrd_dump.c b/src/rrd_dump.c
index e2b18c270eb2fafcee85a2b7fd4f995847763682..26f267d873b44bc0f2df1fa70c787f41842f6096 100644 (file)
--- a/src/rrd_dump.c
+++ b/src/rrd_dump.c
/*****************************************************************************
- * RRDtool 1.3.3 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.6 Copyright by Tobi Oetiker, 1997-2009
*****************************************************************************
* rrd_dump Display a RRD
*****************************************************************************
* checkin
*
*****************************************************************************/
+
+#ifdef WIN32
+#include <stdlib.h>
+#endif
+
+
#include "rrd_tool.h"
#include "rrd_rpncalc.h"
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
#if !(defined(NETWARE) || defined(WIN32))
extern char *tzname[2];
#endif
rrd_t rrd;
rrd_value_t value;
struct tm tm;
-
+ char *old_locale = "";
rrd_file = rrd_open(filename, &rrd, RRD_READONLY | RRD_READAHEAD);
if (rrd_file == NULL) {
rrd_free(&rrd);
} else {
out_file = stdout;
}
-
+#ifdef HAVE_SETLOCALE
+ old_locale = setlocale(LC_NUMERIC, "C");
+#endif
if (!opt_noheader) {
fputs("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n", out_file);
fputs
}
fprintf(out_file, "\t<step> %lu </step> <!-- Seconds -->\n",
rrd.stat_head->pdp_step);
-#if HAVE_STRFTIME
+#ifdef HAVE_STRFTIME
localtime_r(&rrd.live_head->last_up, &tm);
strftime(somestring, 200, "%Y-%m-%d %H:%M:%S %Z", &tm);
#else
rrd_seek(rrd_file, (rra_start + (rrd.rra_ptr[i].cur_row + 1)
* rrd.stat_head->ds_cnt
* sizeof(rrd_value_t)), SEEK_SET);
- timer = -(rrd.rra_def[i].row_cnt - 1);
+ timer = - (long)(rrd.rra_def[i].row_cnt - 1);
ii = rrd.rra_ptr[i].cur_row;
for (ix = 0; ix < rrd.rra_def[i].row_cnt; ix++) {
ii++;
if (out_file != stdout) {
fclose(out_file);
}
+#ifdef HAVE_SETLOCALE
+ setlocale(LC_NUMERIC, old_locale);
+#endif
return rrd_close(rrd_file);
}