bin: consolidate clients

[m6w6/libmemcached] / src / bin / memerror.cc

diff --git a/src/bin/memerror.cc b/src/bin/memerror.cc
index 14a70c29b0ae506132506a93e29a022569702fde..208e013dd6a0d3b915865fcbea8af7abc25b1f04 100644 (file)
--- a/src/bin/memerror.cc
+++ b/src/bin/memerror.cc
@@ -15,102 +15,51 @@
 
 #include "mem_config.h"
 
-#include <cerrno>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <climits>
-
-#include <getopt.h>
-#include <iostream>
-#include <unistd.h>
-
-#include "libmemcached-1.0/memcached.h"
-
-#include "utilities.h"
-
 #define PROGRAM_NAME        "memerror"
-#define PROGRAM_DESCRIPTION "Translate a memcached errror code into a string."
+#define PROGRAM_DESCRIPTION "Translate a memcached error code into a string."
+#define PROGRAM_VERSION     "1.1"
 
-/* Prototypes */
-void options_parse(int argc, char *argv[]);
+#include "common/options.hpp"
 
 int main(int argc, char *argv[]) {
-  options_parse(argc, argv);
-
-  if (argc < 2) {
-    return EXIT_FAILURE;
-  }
-
-  while (optind < argc) {
-    errno = 0;
-    char *nptr;
-    unsigned long value = strtoul(argv[optind], &nptr, 10);
-
-    if ((errno) or (nptr == argv[optind] and value == 0)
-        or (value == ULONG_MAX and errno == ERANGE) or (value == 0 and errno == EINVAL))
-    {
-      std::cerr << "strtoul() was unable to parse given value" << std::endl;
-      return EXIT_FAILURE;
-    }
-
-    if (value < MEMCACHED_MAXIMUM_RETURN) {
-      std::cout << memcached_strerror(NULL, (memcached_return_t) value) << std::endl;
-    } else {
-      std::cerr << memcached_strerror(NULL, MEMCACHED_MAXIMUM_RETURN) << std::endl;
-      return EXIT_FAILURE;
-    }
-
-    optind++;
-  }
-
-  return EXIT_SUCCESS;
-}
-
-void options_parse(int argc, char *argv[]) {
-  static struct option long_options[] = {
-      {(OPTIONSTRING) "version", no_argument, NULL, OPT_VERSION},
-      {(OPTIONSTRING) "help", no_argument, NULL, OPT_HELP},
-      {0, 0, 0, 0},
-  };
-
-  bool opt_version = false;
-  bool opt_help = false;
-  int option_index = 0;
-  while (1) {
-    int option_rv = getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
-    if (option_rv == -1) {
+  client_options opt{PROGRAM_NAME, PROGRAM_VERSION, PROGRAM_DESCRIPTION, "code [code ...]"};
+
+  for (const auto &def : opt.defaults) {
+    switch (def.opt.val) {
+    case 'h': // --help
+    case 'V': // --version
+    case 'v': // --verbose
+    case 'd': // --debug
+      opt.add(def);
+      break;
+    default:
       break;
     }
+  }
 
-    switch (option_rv) {
-    case 0:
-      break;
+  char **argp = nullptr;
+  if (!opt.parse(argc, argv, &argp)) {
+    exit(EXIT_FAILURE);
+  }
 
-    case OPT_VERSION: /* --version or -V */
-      opt_version = true;
-      break;
+  opt.apply(nullptr);
 
-    case OPT_HELP: /* --help or -h */
-      opt_help = true;
-      break;
+  if (!*argp) {
+    std::cerr << "No error codes provided.\n";
+    exit(EXIT_FAILURE);
+  }
 
-    case '?':
-      /* getopt_long already printed an error message. */
-      exit(EXIT_FAILURE);
+  for (auto arg = argp; *arg; ++arg) {
+    auto code = std::stoul(*arg);
+    auto rc = static_cast<memcached_return_t>(code);
 
-    default:
-      exit(EXIT_FAILURE);
+    if (opt.isset("verbose")) {
+      std::cout << "code: " << code << "\n";
+      std::cout << "name: " << memcached_strerror(nullptr, rc) << "\n";
+    } else {
+      std::cout << memcached_strerror(nullptr, rc) << "\n";
     }
   }
 
-  if (opt_version) {
-    version_command(PROGRAM_NAME);
-    exit(EXIT_SUCCESS);
-  }
-
-  if (opt_help) {
-    help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, NULL);
-    exit(EXIT_SUCCESS);
-  }
+  exit(EXIT_SUCCESS);
 }