Adding memstat framework.

[m6w6/libmemcached] / src / memcat.c

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