X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcat.c;fp=src%2Fmemcat.c;h=11b42d7d4aec9ddb7b743effc292418a32c0df31;hb=6d0bec130624e22e695dbf4038fbeed9e1c26c60;hp=5022dd9b431cb6863dec59e1c6862ceea4d9ddfe;hpb=8ed85f5e5e82146dcd869c5f260252e92bad2662;p=awesomized%2Flibmemcached

diff --git a/src/memcat.c b/src/memcat.c
index 5022dd9b..11b42d7d 100644
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -2,25 +2,18 @@
 #include <unistd.h>
 #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;
 
-struct memcached_st *parse_opt_servers (struct memcached_st *m,
-					char *opt_servers)
-{
-  char *s, *hostname;
-  unsigned int portnum;
-  while (s = strsep(&opt_servers, ",")) {
-    hostname = strsep(&s, ":");
-    portnum = atoi(s);
-    memcached_server_add(m, hostname, portnum);
-  }
-  return m;
-}
-
 int main(int argc, char *argv[])
 {
   memcached_st *memc;
@@ -29,6 +22,40 @@ 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) 
+	printf("%d\n", flags);
+      else 
+      {
+        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, OPT_VERSION},
@@ -39,8 +66,6 @@ int main(int argc, char *argv[])
       {"flag", no_argument, &opt_displayflag, OPT_FLAG},
       {0, 0, 0, 0},
     };
-  int option_index = 0;
-  int option_rv;
 
   while (1) 
   {
@@ -58,7 +83,7 @@ int main(int argc, char *argv[])
       exit(0);
       break;
     case OPT_SERVERS: /* --servers */
-      opt_servers = strdup(optarg);
+      opt_servers= optarg;
       break;
     case '?':
       /* getopt_long already printed an error message. */
@@ -67,29 +92,4 @@ int main(int argc, char *argv[])
       abort();
     }
   }
-
-  memc= memcached_init(NULL);
-  memc= parse_opt_servers(memc, opt_servers);
-  
-  while (optind <= argc) {
-    string= memcached_get(memc, argv[optind], strlen(argv[optind]),
-                          &string_length, &flags, &rc);
-    if (rc == MEMCACHED_SUCCESS) {
-      if (opt_displayflag) {
-	printf("%d\n", flags);
-      } else {
-	if (string) 
-	{
-	  printf("%.*s\n", string_length, string);
-	  free(string);
-	}
-      }
-    }
-
-    optind++;
-  }
-
-  memcached_deinit(memc);
-
-  return 0;
-};
+}