X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fbin%2Fmemerror.cc;h=fc4b6c9de4f4b62790feda6727088d2d5766784b;hb=4b7c2c7987bbac32560395e199fe3879c1fb3991;hp=3cee64cce518aaf3b6ca19bb64ac0b399ad6bd55;hpb=5e760300d15ef4c5b7eed3fb9f37920ebca2f6ec;p=awesomized%2Flibmemcached

diff --git a/src/bin/memerror.cc b/src/bin/memerror.cc
index 3cee64cc..fc4b6c9d 100644
--- a/src/bin/memerror.cc
+++ b/src/bin/memerror.cc
@@ -1,129 +1,73 @@
-/* LibMemcached
- * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
- * Copyright (C) 2006-2009 Brian Aker
- * All rights reserved.
- *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
- *
- * Summary:
- *
- */
-#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."
-
-
-/* Prototypes */
-void options_parse(int argc, char *argv[]);
+/*
+    +--------------------------------------------------------------------+
+    | libmemcached-awesome - C/C++ Client Library for memcached          |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted under the terms of the BSD license.    |
+    | You should have received a copy of the license in a bundled file   |
+    | named LICENSE; in case you did not receive a copy you can review   |
+    | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
+    | Copyright (c) 2020-2021 Michael Wallner        https://awesome.co/ |
+    +--------------------------------------------------------------------+
+*/
 
-int main(int argc, char *argv[])
-{
-  options_parse(argc, argv);
+#include "mem_config.h"
 
-  if (argc < 2)
-  {
-    return EXIT_FAILURE;
-  }
+#define PROGRAM_NAME        "memerror"
+#define PROGRAM_DESCRIPTION "Translate a memcached error code into a string."
+#define PROGRAM_VERSION     "1.1"
 
-  while (optind < argc)
-  {
-    errno= 0;
-    char *nptr;
-    unsigned long value= strtoul(argv[optind], &nptr, 10);
+#include "common/options.hpp"
+#include "common/checks.hpp"
 
-    if ((errno != 0) 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;
-    }
+int main(int argc, char *argv[]) {
+  client_options opt{PROGRAM_NAME, PROGRAM_VERSION, PROGRAM_DESCRIPTION, "code [code ...]"};
 
-    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;
+  for (const auto &def : opt.defaults) {
+    switch (def.opt.val) {
+    case 'h': // --help
+    case 'V': // --version
+    case 'v': // --verbose
+    case 'd': // --debug
+    case 'q': // --quiet
+      opt.add(def);
+      break;
+    default:
+      break;
     }
+  }
 
-    optind++;
+  char **argp = nullptr;
+  if (!opt.parse(argc, argv, &argp)) {
+    exit(EXIT_FAILURE);
   }
 
-  return EXIT_SUCCESS;
-}
+  if (!opt.apply(nullptr)) {
+    exit(EXIT_FAILURE);
+  }
 
+  if (!check_argp(opt, argp, "No error code(s) provided.")) {
+    exit(EXIT_FAILURE);
+  }
 
-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},
-    };
+  auto exit_code = EXIT_SUCCESS;
+  for (auto arg = argp; *arg; ++arg) {
+    auto code = std::stoul(*arg);
+    auto rc = static_cast<memcached_return_t>(code);
 
-  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)
-    {
-      break;
+    if (opt.isset("verbose")) {
+      std::cout << "code: " << code << "\n";
+      std::cout << "name: ";
     }
-
-    switch (option_rv)
-    {
-    case 0:
-      break;
-
-    case OPT_VERSION: /* --version or -V */
-      opt_version= true;
-      break;
-
-    case OPT_HELP: /* --help or -h */
-      opt_help= true;
-      break;
-
-    case '?':
-      /* getopt_long already printed an error message. */
-      exit(EXIT_FAILURE);
-
-    default:
-      exit(EXIT_FAILURE);
+    if (rc >= MEMCACHED_MAXIMUM_RETURN) {
+      exit_code = EXIT_FAILURE;
+      std::cerr << memcached_strerror(nullptr, rc) << std::endl;
+    } else {
+      std::cout << memcached_strerror(nullptr, rc) << std::endl;
     }
   }
 
-  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_code);
 }