make sure rrd_dump outputs numbers with C locale so that . does not suddenly become...

[rrdtool.git] / src / rrd_dump.c

diff --git a/src/rrd_dump.c b/src/rrd_dump.c
index 7ad85b20e6a53e86f43b6a3517a50f69bbef7c64..26f267d873b44bc0f2df1fa70c787f41842f6096 100644 (file)
--- a/src/rrd_dump.c
+++ b/src/rrd_dump.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc2  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.6  Copyright by Tobi Oetiker, 1997-2009
  *****************************************************************************
  * rrd_dump  Display a RRD
  *****************************************************************************
@@ -41,36 +41,28 @@
  * 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
 
-int rrd_dump(
-    int argc,
-    char **argv)
-{
-    int       rc;
-
-    if (argc < 2) {
-        rrd_set_error("Not enough arguments");
-        return -1;
-    }
-
-    if (argc == 3) {
-        rc = rrd_dump_r(argv[1], argv[2]);
-    } else {
-        rc = rrd_dump_r(argv[1], NULL);
-    }
 
-    return rc;
-}
-
-int rrd_dump_r(
+int rrd_dump_opt_r(
     const char *filename,
-    char *outname)
+    char *outname,
+    int opt_noheader)
 {
     unsigned int i, ii, ix, iii = 0;
     time_t    now;
@@ -82,7 +74,7 @@ int rrd_dump_r(
     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);
@@ -97,11 +89,15 @@ int rrd_dump_r(
     } else {
         out_file = stdout;
     }
-
-    fputs("<?xml version=\"1.0\" encoding=\"utf-8\"?>", out_file);
-    fputs
-        ("<!DOCTYPE rrd SYSTEM \"http://oss.oetiker.ch/rrdtool/rrdtool.dtd\">",
-         out_file);
+#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
+            ("<!DOCTYPE rrd SYSTEM \"http://oss.oetiker.ch/rrdtool/rrdtool.dtd\">\n",
+             out_file);
+    }
     fputs("<!-- Round Robin Database Dump -->", out_file);
     fputs("<rrd>", out_file);
     if (atoi(rrd.stat_head->version) <= 3) {
@@ -111,7 +107,7 @@ int rrd_dump_r(
     }
     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
@@ -400,7 +396,7 @@ int rrd_dump_r(
         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++;
@@ -440,5 +436,69 @@ int rrd_dump_r(
     if (out_file != stdout) {
         fclose(out_file);
     }
+#ifdef HAVE_SETLOCALE
+    setlocale(LC_NUMERIC, old_locale);
+#endif
     return rrd_close(rrd_file);
 }
+
+/* backward compatibility with 1.2.x */
+int rrd_dump_r(
+    const char *filename,
+    char *outname)
+{
+    return rrd_dump_opt_r(filename, outname, 0);
+}
+
+int rrd_dump(
+    int argc,
+    char **argv)
+{
+    int       rc;
+    int       opt_noheader = 0;
+
+    /* init rrd clean */
+
+    optind = 0;
+    opterr = 0;         /* initialize getopt */
+
+    while (42) {
+        int       opt;
+        int       option_index = 0;
+        static struct option long_options[] = {
+            {"no-header", no_argument, 0, 'n'},
+            {0, 0, 0, 0}
+        };
+
+        opt = getopt_long(argc, argv, "n", long_options, &option_index);
+
+        if (opt == EOF)
+            break;
+
+        switch (opt) {
+        case 'n':
+            opt_noheader = 1;
+            break;
+
+        default:
+            rrd_set_error("usage rrdtool %s [--no-header|-n] "
+                          "file.rrd [file.xml]", argv[0]);
+            return (-1);
+            break;
+        }
+    }                   /* while (42) */
+
+    if ((argc - optind) < 1 || (argc - optind) > 2) {
+        rrd_set_error("usage rrdtool %s [--no-header|-n] "
+                      "file.rrd [file.xml]", argv[0]);
+        return (-1);
+    }
+
+    if ((argc - optind) == 2) {
+        rc = rrd_dump_opt_r(argv[optind], argv[optind + 1], opt_noheader);
+    } else {
+        rc = rrd_dump_opt_r(argv[optind], NULL, opt_noheader);
+    }
+
+    return rc;
+}