Add --help and --version to dnsbulktest

diff --git a/docs/manpages/dnsbulktest.1.md b/docs/manpages/dnsbulktest.1.md
index 6e3a10a565afc01a9e6853fd7210715a7442b24a..a3a3e698e34795ab3dc3ff02bbd9ed0e0903ac50 100644 (file)
--- a/docs/manpages/dnsbulktest.1.md
+++ b/docs/manpages/dnsbulktest.1.md
@@ -25,3 +25,6 @@ domain names from STDIN in the alexa topX format and outputs statistics on STDOU
 
 --envoutput, -e
 :    Write results on STDOUT as shell environment variables
+
+--version
+:    Display the version of dnsbulktest

diff --git a/pdns/dnsbulktest.cc b/pdns/dnsbulktest.cc
index 18a5dbc65f98ad2782c9bc0ac708d5efe3b51751..6636dc90de155c1194a8aace8775c56302c1780c 100644 (file)
--- a/pdns/dnsbulktest.cc
+++ b/pdns/dnsbulktest.cc
@@ -188,6 +188,11 @@ struct SendReceive
   unsigned int d_receiveds, d_receiveerrors, d_senderrors;
 };
 
+void usage(po::options_description &desc) {
+  cerr << "Usage: dnsbulktest [OPTION].. IPADDRESS PORTNUMBER [LIMIT]"<<endl;
+  cerr << desc << "\n";
+}
+
 int main(int argc, char** argv)
 try
 {
@@ -197,6 +202,7 @@ try
     ("quiet,q", "be quiet about individual queries")
     ("type,t",  po::value<string>()->default_value("A"), "What type to query for")
     ("envoutput,e", "write report in shell environment format")
+    ("version", "show the version number")
   ;
 
   po::options_description alloptions;
@@ -216,15 +222,18 @@ try
   po::notify(g_vm);
 
   if (g_vm.count("help")) {
-    cerr << "Usage: dnsbulktest [--options] ip-address portnumber [limit]"<<endl;
-    cerr << desc << "\n";
+    usage(desc);
     return EXIT_SUCCESS;
   }
-  
+
+  if (g_vm.count("version")) {
+    cerr<<"dnsbulktest "<<VERSION<<endl;
+    return EXIT_SUCCESS;
+  }
+
   if(!g_vm.count("portnumber")) {
     cerr<<"Fatal, need to specify ip-address and portnumber"<<endl;
-    cerr << "Usage: dnsbulktest [--options] ip-address portnumber [limit]"<<endl;
-    cerr << desc << "\n";
+    usage(desc);
     return EXIT_FAILURE;
   }