rrdtool dump is now backward compatible with rrdtool 1.3 dump again. Default is ...

--no-header is an alias for --header=none

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1703 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/NEWS b/program/NEWS
index 91107de8ac21d1af7734adadf3bba08d48e5b56a..b31f0fdaf079d460feb24cb403107c4ba75a19bd 100644 (file)
--- a/program/NEWS
+++ b/program/NEWS
@@ -13,4 +13,4 @@ tbd
 RRDdump
 -------
 * no more spaces in output
-* --no-header replaced with --header {xsd,dtd}
+* additional option: --header {none,xsd,dtd}

diff --git a/program/doc/rrddump.pod b/program/doc/rrddump.pod
index 52c68b699060969996885c9d3c8bfe4e1b903fb8..f822e8e5efb81c5368b44ce36cfbf2006eaef09f 100644 (file)
--- a/program/doc/rrddump.pod
+++ b/program/doc/rrddump.pod
@@ -4,17 +4,12 @@ rrddump - dump the contents of an RRD to XML format
 
 =head1 SYNOPSIS
 
-B<rrdtool> B<dump> I<filename.rrd>
-S<[B<--header>|B<-h> {xsd,dtd}]>
+B<rrdtool> B<dump> I<filename.rrd> [I<filename.xml>]
+S<[B<--header>|B<-h> {none,xsd,dtd}]>
+S<[B<--no-header>]>
 S<[B<--daemon> I<address>]>
 S<E<gt> I<filename.xml>>
 
-or 
-
-B<rrdtool> B<dump> I<filename.rrd> I<filename.xml>
-S<[B<--header>|B<-h> {xsd,dtd}]>
-S<[B<--daemon> I<address>]>
-
 =head1 DESCRIPTION
 
 The B<dump> function writes the contents of an B<RRD> in human
@@ -24,7 +19,6 @@ files from one computer architecture to another as well to
 manipulate the contents of an B<RRD> file in a somewhat more
 convenient manner.
 
-
 =over 8
 
 =item I<filename.rrd>
@@ -36,9 +30,18 @@ The name of the B<RRD> you want to dump.
 The (optional) filename that you want to write the XML output to.
 If not specified, the XML will be printed to stdout.
 
-=item B<--header>|B<-h> {xsd,dtd}
+=item B<--header>|B<-h> {none,xsd,dtd}
+
+By default rrdtool will add a dtd header to the xml file. Here
+you can customize this to and xsd header or no header at all.
+
+
+=item B<--no-header>
+
+A shortcut for S<--header=none>.
 
-Optionally rrdtool can add a xsd or dtd header to the dump output.
+If you want to restore the dump with rrdtool 1.2 you should use the
+S<--no-header> option since 1.2 can not deal with xml headers.
 
 =item B<--daemon> I<address>
 

diff --git a/program/src/rrd_dump.c b/program/src/rrd_dump.c
index 9da8fd7935a77d4f1bc43f6f99ce3028f5578bdf..82bc81e66ba5586bdcb66a65cd7825ee409f55c3 100644 (file)
--- a/program/src/rrd_dump.c
+++ b/program/src/rrd_dump.c
@@ -455,7 +455,7 @@ int rrd_dump(
      * 1 = dtd header
      * 2 = xsd header
      */
-    int       opt_header = 0;
+    int       opt_header = 1;
     char     *opt_daemon = NULL;
 
     /* init rrd clean */
@@ -463,16 +463,17 @@ int rrd_dump(
     optind = 0;
     opterr = 0;         /* initialize getopt */
 
-    while (42) {
+    while (42) {/* ha ha */
         int       opt;
         int       option_index = 0;
         static struct option long_options[] = {
             {"daemon", required_argument, 0, 'd'},
             {"header", required_argument, 0, 'h'},
+            {"no-header", no_argument, 0, 'n'},
             {0, 0, 0, 0}
         };
 
-        opt = getopt_long(argc, argv, "d:h:", long_options, &option_index);
+        opt = getopt_long(argc, argv, "d:h:n", long_options, &option_index);
 
         if (opt == EOF)
             break;
@@ -489,16 +490,22 @@ int rrd_dump(
             }
             break;
 
+        case 'n':
+           opt_header = 0;
+           break;
+
         case 'h':
           if (strcmp(optarg, "dtd") == 0) {
                opt_header = 1;
           } else if (strcmp(optarg, "xsd") == 0) {
                opt_header = 2;
+          } else if (strcmp(optarg, "none") == 0) {
+               opt_header = 0;
           }
           break;
 
         default:
-            rrd_set_error("usage rrdtool %s [--header|-h {xsd,dtd}] "
+            rrd_set_error("usage rrdtool %s [--header|-h {none,xsd,dtd}] [--no-header]"
                           "file.rrd [file.xml]", argv[0]);
             return (-1);
             break;
@@ -506,7 +513,7 @@ int rrd_dump(
     }                   /* while (42) */
 
     if ((argc - optind) < 1 || (argc - optind) > 2) {
-        rrd_set_error("usage rrdtool %s [--header|-h {xsd,dtd}] "
+        rrd_set_error("usage rrdtool %s [--header|-h {none,xsd,dtd}] [--no-header]"
                       "file.rrd [file.xml]", argv[0]);
         return (-1);
     }