Use boost.program_options to handle command line arguments in eth and ethkey

Author: demon1999

CMakeLists.txt

@@ -98,8 +98,8 @@ include(EthExecutableHelper)
 include(EthDependencies)
 include(EthUtils)
 
-hunter_add_package(Boost COMPONENTS filesystem system thread)
-find_package(Boost CONFIG REQUIRED filesystem system thread)
+hunter_add_package(Boost COMPONENTS program_options filesystem system thread)
+find_package(Boost CONFIG REQUIRED program_options filesystem system thread)
 
 hunter_add_package(jsoncpp)
 find_package(jsoncpp CONFIG REQUIRED)

eth/CMakeLists.txt

@@ -8,7 +8,7 @@ set(
 add_executable(eth ${sources})
 target_link_libraries(
     eth
-    PRIVATE ethereum ethashseal evm web3jsonrpc webthree devcore
+    PRIVATE ethereum ethashseal evm web3jsonrpc webthree devcore Boost::program_options
 )
 
 target_include_directories(eth PRIVATE ../utils)

eth/MinerAux.h

@@ -101,8 +101,9 @@ class MinerCLI
 		BasicAuthority::init();
 	}
 
-	bool interpretOption(int& i, int argc, char** argv)
+	bool interpretOption(size_t& i, vector<string> const& argv)
 	{
+		size_t argc = argv.size();
 		string arg = argv[i];
 		if (arg == "--benchmark-warmup" && i + 1 < argc)
 			try {

eth/main.cpp

@@ -1,2 +1,2 @@
 add_executable(ethkey KeyAux.h main.cpp)
-target_link_libraries(ethkey PRIVATE ethcore devcore)
+target_link_libraries(ethkey PRIVATE ethcore devcore Boost::program_options)

ethkey/CMakeLists.txt

@@ -107,8 +107,9 @@ class KeyCLI
 
 	KeyCLI(OperationMode _mode = OperationMode::None): m_mode(_mode) {}
 
-	bool interpretOption(int& i, int argc, char** argv)
+	bool interpretOption(size_t& i, vector<string> const& argv)
 	{
+		size_t argc = argv.size();
 		string arg = argv[i];
 		if (arg == "--wallet-path" && i + 1 < argc)
 			m_walletPath = argv[++i];

ethkey/KeyAux.h

@@ -1,16 +1,13 @@
 /*
 	This file is part of cpp-ethereum.
-
 	cpp-ethereum is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-
 	cpp-ethereum is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-
 	You should have received a copy of the GNU General Public License
 	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -26,26 +23,15 @@
 #include <libdevcore/FileSystem.h>
 #include <libdevcore/Log.h>
 #include <libethcore/KeyManager.h>
+#include <boost/program_options.hpp>
+#include <boost/program_options/options_description.hpp>
 #include "BuildInfo.h"
 #include "KeyAux.h"
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
 
-void help()
-{
-	cout
-		<< "Usage ethkey [OPTIONS]" << endl
-		<< "Options:" << endl << endl;
-	KeyCLI::streamHelp(cout);
-	cout
-		<< "General Options:" << endl
-		<< "    -v,--verbosity <0 - 9>  Set the log verbosity from 0 to 9 (default: 8)." << endl
-		<< "    -V,--version  Show the version and exit." << endl
-		<< "    -h,--help  Show this help message and exit." << endl
-		;
-	exit(0);
-}
+namespace po = boost::program_options;
 
 void version()
 {
@@ -61,7 +47,6 @@ to set locale to fail, so there are only two possible actions, the first is to
 throw a runtime exception and cause the program to quit (default behaviour),
 or the second is to modify the environment to something sensible (least
 surprising behaviour).
-
 The follow code produces the least surprising behaviour. It will use the user
 specified default locale if it is valid, and if not then it will modify the
 environment the process is running in to use a sensible default. This also means
@@ -82,25 +67,42 @@ int main(int argc, char** argv)
 	setDefaultOrCLocale();
 	KeyCLI m(KeyCLI::OperationMode::ListBare);
 	g_logVerbosity = 0;
-
-	for (int i = 1; i < argc; ++i)
+	po::options_description generalOptions("General Options");
+	generalOptions.add_options()
+			("verbosity,v", po::value<int>(), "<0 - 9>  Set the log verbosity from 0 to 9 (default: 8).")
+			("version,V", "Show the version and exit.")
+			("help,h",  "Show this help message and exit.");
+	po::parsed_options parsed = po::command_line_parser(argc, argv).options(generalOptions).allow_unregistered().run();
+	vector<string> unrecognisedOptions = collect_unrecognized(parsed.options, po::include_positional);
+	for (size_t i = 0; i < unrecognisedOptions.size(); ++i)
 	{
-		string arg = argv[i];
-		if (m.interpretOption(i, argc, argv)) {}
-		else if ((arg == "-v" || arg == "--verbosity") && i + 1 < argc)
-			g_logVerbosity = atoi(argv[++i]);
-		else if (arg == "-h" || arg == "--help")
-			help();
-		else if (arg == "-V" || arg == "--version")
-			version();
+		string arg = unrecognisedOptions[i];
+		//cout << arg << " ";
+		if (m.interpretOption(i, unrecognisedOptions)) {}
 		else
 		{
 			cerr << "Invalid argument: " << arg << endl;
 			exit(-1);
 		}
 	}
+	po::variables_map vm;
+	po::store(parsed, vm);
+	po::notify(vm);
+	if (vm.count("help"))
+	{
+		cout
+				<< "Usage ethkey [OPTIONS]" << endl
+				<< "Options:" << endl << endl;
+		KeyCLI::streamHelp(cout);
+		cout << generalOptions;
+		exit(0);
+	}
+	if (vm.count("version"))
+		version();
+	if (vm.count("verbosity"))
+		g_logVerbosity = vm["verbosity"].as<int>();
 
 	m.execute();
 
 	return 0;
-}
+}