X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcat.c;h=7789ec9b4e0f72f813257c0320c441ba6adee291;hb=8a685f7ae7c61368a40cd702c55bd662c25891b2;hp=134017fa4fa54d8c76973d78b229ed76f3314592;hpb=21fc482405fde4edd7985c3b0ea30f6b0c4069cb;p=m6w6%2Flibmemcached

diff --git a/src/memcat.c b/src/memcat.c
index 134017fa..7789ec9b 100644
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -3,6 +3,13 @@
 #include <getopt.h>
 #include <memcached.h>
 
+#include "client_options.h"
+#include "utilities.h"
+
+
+/* Prototypes */
+void options_parse(int argc, char *argv[]);
+
 static int opt_verbose;
 static int opt_displayflag;
 static char *opt_servers;
@@ -15,35 +22,75 @@ int main(int argc, char *argv[])
   uint16_t  flags;
   memcached_return rc;
 
+  memc= memcached_init(NULL);
+
+  options_parse(argc, argv);
+
+  parse_opt_servers(memc, opt_servers);
+
+  while (optind <= argc) 
+  {
+    string= memcached_get(memc, argv[argc], strlen(argv[argc]),
+                          &string_length, &flags, &rc);
+    if (rc == MEMCACHED_SUCCESS) 
+    {
+      if (opt_displayflag)
+      {
+	if (opt_verbose)
+	  printf("key: %.*s\nflags: ", argv[argc]);
+	printf("%d\n", flags);
+      }
+      else 
+      {
+	if (opt_verbose)
+	  printf("key: %.*s\nflags: %d\nlength: %d\nvalue: ",
+		 argv[argc], flags, string_length);
+        printf("%.*s\n", string_length, string);
+        free(string);
+      }
+    }
+    optind++;
+  }
+
+  memcached_deinit(memc);
+
+  return 0;
+};
+
+
+void options_parse(int argc, char *argv[])
+{
+  int option_index = 0;
+  int option_rv;
+
   static struct option long_options[] =
     {
-      {"version", no_argument, NULL, 257},
-      {"help", no_argument, NULL, 258},
+      {"version", no_argument, NULL, OPT_VERSION},
+      {"help", no_argument, NULL, OPT_HELP},
       {"verbose", no_argument, &opt_verbose, 1},
       {"debug", no_argument, &opt_verbose, 2},
-      {"servers", required_argument, NULL, 259},
-      {"flag", no_argument, &opt_displayflag, 1},
+      {"servers", required_argument, NULL, OPT_SERVERS},
+      {"flag", no_argument, &opt_displayflag, OPT_FLAG},
       {0, 0, 0, 0},
     };
-  int option_index = 0;
-  int option_rv;
 
-  while (1) {
-    option_rv = getopt_long(argc, argv, "", long_options, &option_index);
+  while (1) 
+  {
+    option_rv = getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
     if (option_rv == -1) break;
     switch (option_rv) {
     case 0:
       break;
-    case 257: /* --version */
+    case OPT_VERSION: /* --version or -V */
       printf("memcache tools, memcat, v1.0\n");
       exit(0);
       break;
-    case 258: /* --help */
+    case OPT_HELP: /* --help or -h */
       printf("useful help messages go here\n");
       exit(0);
       break;
-    case 259: /* --servers */
-      opt_servers = strdup(optarg);
+    case OPT_SERVERS: /* --servers or -s */
+      opt_servers= optarg;
       break;
     case '?':
       /* getopt_long already printed an error message. */
@@ -52,21 +99,4 @@ int main(int argc, char *argv[])
       abort();
     }
   }
-
-  /* todo, turn opt_servers into something to pass to memcached_init */
-  memc= memcached_init(NULL);
-
-  while (optind < argc) {
-    string= memcached_get(memc, argv[optind], strlen(argv[optind]),
-                          &string_length, &flags, &rc);
-    if (string) {
-      printf("%.*s\n", string_length, string);
-      free(string);
-    }
-    optind++;
-  }
-
-  memcached_deinit(memc);
-
-  return 0;
-};
+}