From 04d751ae562202b94888ad0b77be4f6c1a822086 Mon Sep 17 00:00:00 2001
From: David Blacka <davidb@verisign.com>
Date: Wed, 2 Feb 2011 18:59:06 +0000
Subject: [PATCH] Add -m option to jdnssec-zoneformat

git-svn-id: https://svn.verisignlabs.com/jdnssec/tools/trunk@225 4cbd57fe-54e5-0310-bd9a-f30fe5ea5e6e
---
 ChangeLog                                      | 4 ++++
 src/com/verisignlabs/dnssec/cl/ZoneFormat.java | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b23fdf1..ed165cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-11  Blacka  <davidb@verisignlabs.com>
+
+	* jdnssec-zoneformat: add a -m option for formatting as multiline.
+
 2010-12-14  Blacka  <davidb@verisignlabs.com>
 
 	* jdnssec-verifyzone: Add options to either fudge or ignore RRSIG
diff --git a/src/com/verisignlabs/dnssec/cl/ZoneFormat.java b/src/com/verisignlabs/dnssec/cl/ZoneFormat.java
index fcd5524..123c636 100644
--- a/src/com/verisignlabs/dnssec/cl/ZoneFormat.java
+++ b/src/com/verisignlabs/dnssec/cl/ZoneFormat.java
@@ -40,6 +40,7 @@ import java.util.logging.Logger;
 
 import org.apache.commons.cli.*;
 import org.xbill.DNS.Master;
+import org.xbill.DNS.Options;
 import org.xbill.DNS.Record;
 import org.xbill.DNS.Section;
 
@@ -80,6 +81,7 @@ public class ZoneFormat
       // String optstr = null;
 
       if (cli.hasOption('h')) usage();
+      if (cli.hasOption('m')) Options.set("multiline");
 
       if (cli.hasOption('v'))
       {
@@ -122,6 +124,7 @@ public class ZoneFormat
 
       // boolean options
       opts.addOption("h", "help", false, "Print this message.");
+      opts.addOption("m", "multiline", false, "Use a multiline format");
 
       // Argument options
       OptionBuilder.hasOptionalArg();