X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fbin%2Fmemcat.cc;h=00519b520bd9f1193d86a49c7c4b6bdfe1a6c78c;hb=9b0e362f4bf6efa125dbb1a4a70c3de7298c2ca8;hp=ca69d6f9f228528ed628993794769b74876e87fc;hpb=800db6e937f7e0e5a0a7028704950c78f51af41e;p=m6w6%2Flibmemcached

diff --git a/src/bin/memcat.cc b/src/bin/memcat.cc
index ca69d6f9..00519b52 100644
--- a/src/bin/memcat.cc
+++ b/src/bin/memcat.cc
@@ -15,231 +15,125 @@
 
 #include "mem_config.h"
 
-#include <cstdio>
-#include <cstring>
-#include <getopt.h>
-#include <iostream>
-#include <unistd.h>
-#include "libmemcached-1.0/memcached.h"
-
-#include "utilities.h"
-
 #define PROGRAM_NAME        "memcat"
 #define PROGRAM_DESCRIPTION "Cat a set of key values to stdout."
+#define PROGRAM_VERSION     "1.1"
 
-/* Prototypes */
-void options_parse(int argc, char *argv[]);
+#include "libmemcached/common.h"
+#include "common/options.hpp"
 
-static int opt_binary = 0;
-static int opt_verbose = 0;
-static int opt_displayflag = 0;
-static char *opt_servers = NULL;
-static char *opt_hash = NULL;
-static char *opt_username;
-static char *opt_passwd;
-static char *opt_file;
+#include <iostream>
+#include <fstream>
 
-int main(int argc, char *argv[]) {
-  char *string;
-  size_t string_length;
-  uint32_t flags;
+memcached_return_t memcat(const client_options &opt, memcached_st *memc, const char *key, std::ostream &ref) {
   memcached_return_t rc;
+  uint32_t flags;
+  size_t len;
+  auto val = memcached_get(memc, key, strlen(key), &len, &flags, &rc);
 
-  int return_code = EXIT_SUCCESS;
-
-  options_parse(argc, argv);
-  initialize_sockets();
-
-  if (opt_servers == NULL) {
-    char *temp;
-
-    if ((temp = getenv("MEMCACHED_SERVERS"))) {
-      opt_servers = strdup(temp);
+  if (MEMCACHED_SUCCESS == rc) {
+    if (opt.flags.verbose) {
+      ref << "key: " << key << "\n";
     }
-
-    if (opt_servers == NULL) {
-      std::cerr << "No servers provided" << std::endl;
-      exit(EXIT_FAILURE);
+    if (opt.flags.flags) {
+      ref << "flags: " << flags << "\n";
+    }
+    if (opt.flags.verbose) {
+      ref << "value: ";
     }
+    ref.write(val, len);
+    ref << std::endl;
   }
 
-  memcached_server_st *servers = memcached_servers_parse(opt_servers);
-  if (servers == NULL or memcached_server_list_count(servers) == 0) {
-    std::cerr << "Invalid server list provided:" << opt_servers << std::endl;
-    return EXIT_FAILURE;
+  if (val) {
+    free(val);
   }
+  return rc;
+}
 
-  memcached_st *memc = memcached_create(NULL);
-  process_hash_option(memc, opt_hash);
-
-  memcached_server_push(memc, servers);
-  memcached_server_list_free(servers);
-  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, (uint64_t) opt_binary);
+int main(int argc, char *argv[]) {
+  memcached_st memc;
+  client_options opt{PROGRAM_NAME, PROGRAM_VERSION, PROGRAM_DESCRIPTION, {
+      client_options::flag::help,
+      client_options::flag::version,
+      client_options::flag::verbose,
+      client_options::flag::debug,
+      client_options::flag::quiet,
+      client_options::flag::servers,
+      client_options::flag::binary,
+      client_options::flag::username,
+      client_options::flag::password,
+      client_options::flag::hash,
+      client_options::flag::flags,
+      client_options::flag::file,
+  }};
+
+  if (!opt.parse(argc, argv)) {
+    exit(EXIT_FAILURE);
+  }
+  if (opt.flags.help) {
+    opt.printHelp("key [ key ... ]");
+    exit(EXIT_SUCCESS);
+  }
+  if (opt.flags.version) {
+    opt.printVersion();
+    exit(EXIT_SUCCESS);
+  }
 
-  if (opt_username and LIBMEMCACHED_WITH_SASL_SUPPORT == 0) {
-    memcached_free(memc);
-    std::cerr << "--username was supplied, but binary was not built with SASL support."
-              << std::endl;
-    return EXIT_FAILURE;
+  if (opt.flags.quiet && !opt.args.file) {
+    std::cerr << "--quiet operation was requested, but --file was not set.\n";
+    exit(EXIT_FAILURE);
   }
 
-  if (opt_username) {
-    memcached_return_t ret;
-    if (memcached_failed(ret = memcached_set_sasl_auth_data(memc, opt_username, opt_passwd))) {
-      std::cerr << memcached_last_error_message(memc) << std::endl;
-      memcached_free(memc);
-      return EXIT_FAILURE;
+  if (!memcached_create(&memc)) {
+    if (!opt.flags.quiet) {
+      std::cerr << "Failed to initialize memcached client.\n";
     }
+    exit(EXIT_FAILURE);
   }
 
-  while (optind < argc) {
-    string = memcached_get(memc, argv[optind], strlen(argv[optind]), &string_length, &flags, &rc);
-    if (rc == MEMCACHED_SUCCESS) {
-      if (opt_displayflag) {
-        if (opt_verbose) {
-          std::cout << "key: " << argv[optind] << std::endl << "flags: ";
-        }
-        std::cout << flags << std::endl;
-      } else {
-        if (opt_verbose) {
-          std::cout << "key: " << argv[optind] << std::endl
-                    << "flags: " << flags << std::endl
-                    << "length: " << string_length << std::endl
-                    << "value: ";
-        }
+  if (!opt.apply(&memc)) {
+    memcached_free(&memc);
+    exit(EXIT_FAILURE);
+  }
 
-        if (opt_file) {
-          FILE *fp = fopen(opt_file, "w");
-          if (fp == NULL) {
-            perror("fopen");
-            return_code = EXIT_FAILURE;
-            break;
-          }
+  if (!*opt.args.positional) {
+    if (!opt.flags.quiet) {
+      std::cerr << "No key(s) provided.\n";
+      memcached_free(&memc);
+      exit(EXIT_FAILURE);
+    }
+  }
 
-          size_t written = fwrite(string, 1, string_length, fp);
-          if (written != string_length) {
-            std::cerr << "error writing file to file " << opt_file << " wrote " << written
-                      << ", should have written" << string_length << std::endl;
-            return_code = EXIT_FAILURE;
-            break;
-          }
+  auto exit_code = EXIT_SUCCESS;
+  for (auto arg = opt.args.positional; *arg; ++arg) {
+    auto key = *arg;
+    if (*key) {
+      memcached_return_t rc;
+      if (opt.args.file && *opt.args.file) {
+        std::ofstream file{opt.args.file, std::ios::binary};
+        rc = memcat(opt, &memc, key, file);
+      } else {
+        rc = memcat(opt, &memc, key, std::cout);
+      }
+      if (MEMCACHED_SUCCESS != rc) {
+        exit_code = EXIT_FAILURE;
 
-          if (fclose(fp)) {
-            std::cerr << "error closing " << opt_file << std::endl;
-            return_code = EXIT_FAILURE;
-            break;
+        if (MEMCACHED_NOTFOUND == rc) {
+          if (opt.flags.verbose) {
+            std::cerr << "not found: " << key << "\n";
           }
+          // continue;
         } else {
-          std::cout.write(string, string_length);
-          std::cout << std::endl;
+          if (!opt.flags.quiet) {
+            std::cerr << memcached_last_error_message(&memc) << "\n";
+          }
+          break;
         }
       }
-    } else if (rc != MEMCACHED_NOTFOUND) {
-      std::cerr << "error on " << argv[optind] << "(" << memcached_strerror(memc, rc) << ")";
-      if (memcached_last_error_errno(memc)) {
-        std::cerr << " system error (" << strerror(memcached_last_error_errno(memc)) << ")"
-                  << std::endl;
-      }
-      std::cerr << std::endl;
-
-      return_code = EXIT_FAILURE;
-      break;
-    } else // Unknown Issue
-    {
-      std::cerr << "error on " << argv[optind] << "(" << memcached_strerror(NULL, rc) << ")"
-                << std::endl;
-      return_code = EXIT_FAILURE;
     }
-    optind++;
-    free(string);
-    string = nullptr;
-  }
-  if (string) {
-    free(string);
-  }
-
-  memcached_free(memc);
-
-  if (opt_servers) {
-    free(opt_servers);
-  }
-  if (opt_hash) {
-    free(opt_hash);
   }
 
-  return return_code;
-}
-
-void options_parse(int argc, char *argv[]) {
-  int option_index = 0;
-
-  memcached_programs_help_st help_options[] = {
-      {0},
-  };
-
-  static struct option long_options[] = {
-      {(OPTIONSTRING) "version", no_argument, NULL, OPT_VERSION},
-      {(OPTIONSTRING) "help", no_argument, NULL, OPT_HELP},
-      {(OPTIONSTRING) "quiet", no_argument, NULL, OPT_QUIET},
-      {(OPTIONSTRING) "verbose", no_argument, &opt_verbose, OPT_VERBOSE},
-      {(OPTIONSTRING) "debug", no_argument, &opt_verbose, OPT_DEBUG},
-      {(OPTIONSTRING) "servers", required_argument, NULL, OPT_SERVERS},
-      {(OPTIONSTRING) "flag", no_argument, &opt_displayflag, OPT_FLAG},
-      {(OPTIONSTRING) "hash", required_argument, NULL, OPT_HASH},
-      {(OPTIONSTRING) "binary", no_argument, NULL, OPT_BINARY},
-      {(OPTIONSTRING) "username", required_argument, NULL, OPT_USERNAME},
-      {(OPTIONSTRING) "password", required_argument, NULL, OPT_PASSWD},
-      {(OPTIONSTRING) "file", required_argument, NULL, OPT_FILE},
-      {0, 0, 0, 0},
-  };
-
-  while (1) {
-    int option_rv = getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
-    if (option_rv == -1)
-      break;
-    switch (option_rv) {
-    case 0:
-      break;
-    case OPT_BINARY:
-      opt_binary = 1;
-      break;
-    case OPT_VERBOSE: /* --verbose or -v */
-      opt_verbose = OPT_VERBOSE;
-      break;
-    case OPT_DEBUG: /* --debug or -d */
-      opt_verbose = OPT_DEBUG;
-      break;
-    case OPT_VERSION: /* --version or -V */
-      version_command(PROGRAM_NAME);
-      break;
-    case OPT_HELP: /* --help or -h */
-      help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, help_options);
-      break;
-    case OPT_SERVERS: /* --servers or -s */
-      opt_servers = strdup(optarg);
-      break;
-    case OPT_HASH:
-      opt_hash = strdup(optarg);
-      break;
-    case OPT_USERNAME:
-      opt_username = optarg;
-      break;
-    case OPT_PASSWD:
-      opt_passwd = optarg;
-      break;
-    case OPT_FILE:
-      opt_file = optarg;
-      break;
-
-    case OPT_QUIET:
-      close_stdio();
-      break;
-
-    case '?':
-      /* getopt_long already printed an error message. */
-      exit(EXIT_FAILURE);
-    default:
-      abort();
-    }
-  }
+  memcached_free(&memc);
+  exit(exit_code);
 }