From ff5ba4f9e50a560411768776663d08d4c211fe98 Mon Sep 17 00:00:00 2001
From: Winfried Angele <abang@t-ipnet.net>
Date: Tue, 29 Apr 2014 11:20:31 +0200
Subject: [PATCH] to ask for help is not an error

---
 pdns/dynloader.cc     | 6 +++---
 pdns/pdns_recursor.cc | 6 +++---
 pdns/pdnssec.cc       | 6 +++---
 pdns/rec_control.cc   | 8 +++++++-
 pdns/receiver.cc      | 6 +++---
 pdns/zone2json.cc     | 8 +++++++-
 pdns/zone2ldap.cc     | 9 ++++++++-
 pdns/zone2sql.cc      | 8 +++++++-
 8 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/pdns/dynloader.cc b/pdns/dynloader.cc
index 451e4ce612..a32bafb2b4 100644
--- a/pdns/dynloader.cc
+++ b/pdns/dynloader.cc
@@ -70,9 +70,9 @@ int main(int argc, char **argv)
   ::arg().laxParse(argc,argv);
 
   if(::arg().mustDo("help")) {
-    cerr<<"syntax:"<<endl<<endl;
-    cerr<<::arg().helpstring(::arg()["help"])<<endl;
-    exit(99);
+    cout<<"syntax:"<<endl<<endl;
+    cout<<::arg().helpstring(::arg()["help"])<<endl;
+    exit(0);
   }
 
   const vector<string>commands=::arg().getCommands();
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index cd16f00f1a..b1aabae5e3 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2185,9 +2185,9 @@ int main(int argc, char **argv)
     ::arg().set("delegation-only")=toLower(::arg()["delegation-only"]);
 
     if(::arg().mustDo("help")) {
-      cerr<<"syntax:"<<endl<<endl;
-      cerr<<::arg().helpstring(::arg()["help"])<<endl;
-      exit(99);
+      cout<<"syntax:"<<endl<<endl;
+      cout<<::arg().helpstring(::arg()["help"])<<endl;
+      exit(0);
     }
     if(::arg().mustDo("version")) {
       showProductVersion();
diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 564eb3f2d7..2f4affd3b5 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -118,9 +118,9 @@ void loadMainConfig(const std::string& configdir)
   //::arg().laxParse(argc,argv);
 
   if(::arg().mustDo("help")) {
-    cerr<<"syntax:"<<endl<<endl;
-    cerr<<::arg().helpstring(::arg()["help"])<<endl;
-    exit(99);
+    cout<<"syntax:"<<endl<<endl;
+    cout<<::arg().helpstring(::arg()["help"])<<endl;
+    exit(0);
   }
 
   if(::arg()["config-name"]!="") 
diff --git a/pdns/rec_control.cc b/pdns/rec_control.cc
index 1f29a390d2..86a8e8471c 100644
--- a/pdns/rec_control.cc
+++ b/pdns/rec_control.cc
@@ -49,7 +49,13 @@ static void initArguments(int argc, char** argv)
   arg().setCmd("help","Provide this helpful message");
 
   arg().laxParse(argc,argv);  
-  if(arg().getCommands().empty() || arg().mustDo("help")) {
+  if(arg().mustDo("help")) {
+    cout<<"syntax: rec_control [options] command, options as below: "<<endl<<endl;
+    cout<<arg().helpstring(arg()["help"])<<endl;
+    exit(0);
+  }
+
+  if(arg().getCommands().empty()) {
     cerr<<"syntax: rec_control [options] command, options as below: "<<endl<<endl;
     cerr<<arg().helpstring(arg()["help"])<<endl;
     exit(99);
diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 2ec3333aff..5d5e8846b8 100644
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -509,9 +509,9 @@ int main(int argc, char **argv)
     }
     
     if(::arg().mustDo("help")) {
-      cerr<<"syntax:"<<endl<<endl;
-      cerr<<::arg().helpstring(::arg()["help"])<<endl;
-      exit(99);
+      cout<<"syntax:"<<endl<<endl;
+      cout<<::arg().helpstring(::arg()["help"])<<endl;
+      exit(0);
     }
     
     if(::arg().mustDo("config")) {
diff --git a/pdns/zone2json.cc b/pdns/zone2json.cc
index e7bc93d5b6..82bbfddc2a 100644
--- a/pdns/zone2json.cc
+++ b/pdns/zone2json.cc
@@ -155,7 +155,13 @@ try
 
     ::arg().parse(argc, argv);
   
-    if(argc<2 || ::arg().mustDo("help")) {
+    if(::arg().mustDo("help")) {
+      cout<<"syntax:"<<endl<<endl;
+      cout<<::arg().helpstring()<<endl;
+      exit(0);
+    }
+
+    if(argc<2) {
       cerr<<"syntax:"<<endl<<endl;
       cerr<<::arg().helpstring()<<endl;
       exit(1);
diff --git a/pdns/zone2ldap.cc b/pdns/zone2ldap.cc
index f53f109252..f004a60954 100644
--- a/pdns/zone2ldap.cc
+++ b/pdns/zone2ldap.cc
@@ -169,7 +169,14 @@ int main( int argc, char* argv[] )
 
                 args.parse( argc, argv );
 
-                if( argc < 2 || args.mustDo( "help" ) )
+                if( args.mustDo( "help" ) )
+                {
+                        cout << "Syntax:" << endl << endl;
+                        cout << args.helpstring() << endl;
+                        exit( 0 );
+                }
+
+                if( argc < 2 )
                 {
                         cerr << "Syntax:" << endl << endl;
                         cerr << args.helpstring() << endl;
diff --git a/pdns/zone2sql.cc b/pdns/zone2sql.cc
index 250c31ec01..40caa2ba91 100644
--- a/pdns/zone2sql.cc
+++ b/pdns/zone2sql.cc
@@ -291,7 +291,13 @@ try
 
     ::arg().parse(argc, argv);
   
-    if(argc<2 || ::arg().mustDo("help")) {
+    if(::arg().mustDo("help")) {
+      cout<<"syntax:"<<endl<<endl;
+      cout<<::arg().helpstring()<<endl;
+      exit(0);
+    }
+
+    if(argc<2) {
       cerr<<"syntax:"<<endl<<endl;
       cerr<<::arg().helpstring()<<endl;
       exit(1);
-- 
2.47.2