Adding memstat framework.

[awesomized/libmemcached] / src / memcat.c

diff --git a/src/memcat.c b/src/memcat.c
index 77c0f8586829348619b1c4081391254665ab3d32..dedcb94595e5bc79f9417c0cefaffe17aeaa68f6 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -2,7 +2,13 @@
 #include <unistd.h>\r
 #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
@@ -17,6 +23,40 @@ int main(int argc, char *argv[])
   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, OPT_VERSION},\r
@@ -27,8 +67,6 @@ int main(int argc, char *argv[])
       {"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
   {\r
@@ -46,7 +84,7 @@ int main(int argc, char *argv[])
       exit(0);\r
       break;\r
     case OPT_SERVERS: /* --servers */\r
-      opt_servers = strdup(optarg);\r
+      opt_servers= strdup(optarg);\r
       break;\r
     case '?':\r
       /* getopt_long already printed an error message. */\r
@@ -55,22 +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
-  for (x= 1; x < argc; x++)\r
-  {\r
-    string= memcached_get(memc, argv[x], strlen(argv[x]),\r
-                          &string_length, &flags, &rc);\r
-    if (string) \r
-    {\r
-      printf("%.*s\n", string_length, string);\r
-      free(string);\r
-    }\r
-  }\r
-\r
-  memcached_deinit(memc);\r
-\r
-  return 0;\r
-};\r
+}\r