From: Kefu Chai <kchai@redhat.com>
Date: Sun, 17 Nov 2019 02:43:28 +0000 (+0800)
Subject: librados-config: refactor to use boost::program_options
X-Git-Tag: v15.1.0~776^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d781797a7bdc087da9a6c70878329b35f4562af4;p=ceph.git

librados-config: refactor to use boost::program_options

for two reasons:

* since this program does not parse or read ceph options, there is no
  need to link against libglobal. the advantage of removing this linkaga
  is that we can have smaller executable, and smaller debuginfo package.
* better readability and less LOC.

for better readability

Fixes: https://tracker.ceph.com/issues/42782
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 91680cbe5282b..7f53515155221 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -480,7 +480,7 @@ add_subdirectory(mgr)
 set(librados_config_srcs
   librados-config.cc)
 add_executable(librados-config ${librados_config_srcs})
-target_link_libraries(librados-config librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
+target_link_libraries(librados-config librados Boost::program_options)
 
 install(TARGETS librados-config DESTINATION bin)
 
diff --git a/src/librados-config.cc b/src/librados-config.cc
index e8bb694d40429..36bda89bb63ed 100644
--- a/src/librados-config.cc
+++ b/src/librados-config.cc
@@ -11,76 +11,43 @@
  * Foundation.  See file COPYING.
  *
  */
+#include <iostream>
 
-#include "common/config.h"
+#include <boost/program_options/cmdline.hpp>
+#include <boost/program_options/option.hpp>
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/parsers.hpp>
+#include <boost/program_options/variables_map.hpp>
 
-#include "common/ceph_argparse.h"
-#include "global/global_init.h"
-#include "global/global_context.h"
 #include "include/rados/librados.h"
 
-void usage()
-{
-  cout << "usage: librados-config [option]\n"
-       << "where options are:\n"
-       << "  --version                    library version\n"
-       << "  --vernum                     library version code\n";
-}
-
-void usage_exit()
-{
-  usage();
-  exit(1);
-}
+namespace po = boost::program_options;
 
 int main(int argc, const char **argv) 
 {
-  vector<const char*> args;
-  argv_to_vec(argc, argv, args);
-  if (args.empty()) {
-    cerr << argv[0] << ": -h or --help for usage" << std::endl;
-    exit(1);
-  }
-  if (ceph_argparse_need_usage(args)) {
-    usage();
-    exit(0);
-  }
-
-  bool opt_version = false;
-  bool opt_vernum = false;
-
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
-			 CODE_ENVIRONMENT_UTILITY,
-			 CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
-  common_init_finish(g_ceph_context);
-  for (std::vector<const char*>::iterator i = args.begin();
-       i != args.end(); ) {
-    if (strcmp(*i, "--") == 0) {
-      break;
-    }
-    else if (strcmp(*i, "--version") == 0) {
-      opt_version = true;
-      i = args.erase(i);
-    }
-    else if (strcmp(*i, "--vernum") == 0) {
-      opt_vernum = true;
-      i = args.erase(i);
-    }
-    else
-      ++i;
-  }
-
-  if (!opt_version && !opt_vernum)
-    usage_exit();
-
-  if (opt_version) {
+  po::options_description desc{"usage: librados-config [option]"};
+  desc.add_options()
+    ("help,h", "print this help message")
+    ("version", "library version")
+    ("vernum", "library version code");
+
+  po::parsed_options parsed =
+    po::command_line_parser(argc, argv).options(desc).run();
+  po::variables_map vm;
+  po::store(parsed, vm);
+  po::notify(vm);
+
+  if (vm.count("help")) {
+    std::cout << desc << std::endl;
+  } else if (vm.count("version")) {
     int maj, min, ext;
     rados_version(&maj, &min, &ext);
-    cout << maj << "." << min << "." << ext << std::endl;
-  } else if (opt_vernum) {
-    cout << hex << LIBRADOS_VERSION_CODE << dec << std::endl;
+    std::cout << maj << "." << min << "." << ext << std::endl;
+  } else if (vm.count("vernum")) {
+    std::cout << std::hex << LIBRADOS_VERSION_CODE << std::dec << std::endl;
+  } else {
+    std::cerr << argv[0] << ": -h or --help for usage" << std::endl;
+    return 1;
   }
-
-  return 0;
 }