add options to memcp, fix options in memcat

[awesomized/libmemcached] / src / memcat.c

diff --git a/src/memcat.c b/src/memcat.c
index 77c0f8586829348619b1c4081391254665ab3d32..eb85329125c3428d59e3b49ed1b2f8a94e2cd092 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -8,6 +8,19 @@ static int opt_verbose;
 static int opt_displayflag;\r
 static char *opt_servers;\r
 \r
+struct memcached_st *parse_opt_servers (struct memcached_st *m,\r
+                                       char *opt_servers)\r
+{\r
+  char *s, *hostname;\r
+  unsigned int portnum;\r
+  while (s = strsep(&opt_servers, ",")) {\r
+    hostname = strsep(&s, ":");\r
+    portnum = atoi(s);\r
+    memcached_server_add(m, hostname, portnum);\r
+  }\r
+  return m;\r
+}\r
+\r
 int main(int argc, char *argv[])\r
 {\r
   memcached_st *memc;\r
@@ -15,14 +28,13 @@ int main(int argc, char *argv[])
   size_t string_length;\r
   uint16_t  flags;\r
   memcached_return rc;\r
-  unsigned int x;\r
 \r
   static struct option long_options[] =\r
     {\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
+      {"verbose", no_argument, &opt_verbose, 1},\r
+      {"debug", no_argument, &opt_verbose, 2},\r
       {"servers", required_argument, NULL, OPT_SERVERS},\r
       {"flag", no_argument, &opt_displayflag, OPT_FLAG},\r
       {0, 0, 0, 0},\r
@@ -56,18 +68,25 @@ int main(int argc, char *argv[])
     }\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
+  memc= parse_opt_servers(memc, opt_servers);\r
+  \r
+  while (optind < argc) {\r
+    string= memcached_get(memc, argv[optind], strlen(argv[optind]),\r
                           &string_length, &flags, &rc);\r
-    if (string) \r
-    {\r
-      printf("%.*s\n", string_length, string);\r
-      free(string);\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
+    optind++;\r
   }\r
 \r
   memcached_deinit(memc);\r