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

diff --git a/src/bin/memcat.cc b/src/bin/memcat.cc
index 00519b52..b8e49486 100644
--- a/src/bin/memcat.cc
+++ b/src/bin/memcat.cc
@@ -19,30 +19,40 @@
 #define PROGRAM_DESCRIPTION "Cat a set of key values to stdout."
 #define PROGRAM_VERSION     "1.1"
 
-#include "libmemcached/common.h"
 #include "common/options.hpp"
+#include "common/checks.hpp"
 
 #include <iostream>
 #include <fstream>
 
-memcached_return_t memcat(const client_options &opt, memcached_st *memc, const char *key, std::ostream &ref) {
+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);
+  auto verbose = opt.isset("verbose");
 
   if (MEMCACHED_SUCCESS == rc) {
-    if (opt.flags.verbose) {
-      ref << "key: " << key << "\n";
+    if (verbose) {
+      *ref << "key: " << key << "\n";
     }
-    if (opt.flags.flags) {
-      ref << "flags: " << flags << "\n";
+    if (opt.isset("flags")) {
+      if (verbose) {
+      *ref << "flags: ";
+      }
+      *ref << flags << "\n";
+    }
+    if (verbose) {
+      *ref << "value: ";
     }
-    if (opt.flags.verbose) {
-      ref << "value: ";
+    
+    ref->write(val, len);
+
+    if (verbose || !opt.isset("file")) {
+      *ref << std::endl;
     }
-    ref.write(val, len);
-    ref << std::endl;
+
+    ref->flush();
   }
 
   if (val) {
@@ -52,43 +62,26 @@ memcached_return_t memcat(const client_options &opt, memcached_st *memc, const c
 }
 
 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);
+  client_options opt{PROGRAM_NAME, PROGRAM_VERSION, PROGRAM_DESCRIPTION, "key [key ...]"};
+
+  for (const auto &def : opt.defaults) {
+    opt.add(def);
   }
-  if (opt.flags.version) {
-    opt.printVersion();
-    exit(EXIT_SUCCESS);
+  opt.add("flags", 'F', no_argument, "Display key flags, too.");
+  opt.add("file", 'f', required_argument, "Output to file instead of standard output.");
+
+  char **argp = nullptr;
+  if (!opt.parse(argc, argv, &argp)) {
+    exit(EXIT_FAILURE);
   }
 
-  if (opt.flags.quiet && !opt.args.file) {
+  if (opt.isset("quiet") && !opt.isset("file")) {
     std::cerr << "--quiet operation was requested, but --file was not set.\n";
     exit(EXIT_FAILURE);
   }
 
-  if (!memcached_create(&memc)) {
-    if (!opt.flags.quiet) {
-      std::cerr << "Failed to initialize memcached client.\n";
-    }
+  memcached_st memc;
+  if (!check_memcached(opt, memc)) {
     exit(EXIT_FAILURE);
   }
 
@@ -97,39 +90,20 @@ int main(int argc, char *argv[]) {
     exit(EXIT_FAILURE);
   }
 
-  if (!*opt.args.positional) {
-    if (!opt.flags.quiet) {
-      std::cerr << "No key(s) provided.\n";
-      memcached_free(&memc);
-      exit(EXIT_FAILURE);
-    }
+  if (!check_argp(opt, argp, "No key(s) provided.")) {
+    memcached_free(&memc);
+    exit(EXIT_FAILURE);
   }
 
   auto exit_code = EXIT_SUCCESS;
-  for (auto arg = opt.args.positional; *arg; ++arg) {
+  for (auto arg = argp; *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;
+      std::ofstream fstream{};
+      std::ostream *ostream = check_ostream(opt, opt.argof("file"), fstream);
 
-        if (MEMCACHED_NOTFOUND == rc) {
-          if (opt.flags.verbose) {
-            std::cerr << "not found: " << key << "\n";
-          }
-          // continue;
-        } else {
-          if (!opt.flags.quiet) {
-            std::cerr << memcached_last_error_message(&memc) << "\n";
-          }
-          break;
-        }
+      if (!check_return(opt, memc, key, memcat(opt, &memc, key, ostream))) {
+        exit_code = EXIT_FAILURE;
       }
     }
   }