X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcat.c;h=1e7f5bf7821131aa1c63c371dc46c6caa53d7332;hb=875200dc0c5668bba4f8a68b487f9d2f2a1eedb0;hp=645b54ac3d762f7459823e835f6d5b1fda16e47c;hpb=18bd58a6e40d5398b84d42725453e47f7834639f;p=m6w6%2Flibmemcached

diff --git a/src/memcat.c b/src/memcat.c
index 645b54ac..1e7f5bf7 100644
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -2,35 +2,76 @@
 #include <unistd.h>
 #include <getopt.h>
 #include <memcached.h>
+
 #include "client_options.h"
+#include "utilities.h"
 
-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;
-}
+/* Prototypes */
+void options_parse(int argc, char *argv[]);
+
+static int opt_verbose= 0;
+static int opt_displayflag= 0;
+static char *opt_servers;
 
 int main(int argc, char *argv[])
 {
   memcached_st *memc;
   char *string;
   size_t string_length;
-  uint16_t  flags;
+  uint16_t flags;
   memcached_return rc;
-  unsigned int x;
 
-  static struct option long_options[] =
+  memc= memcached_init(NULL);
+
+  options_parse(argc, argv);
+
+  if (opt_servers)
+    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)
+      {
+        if (opt_verbose)
+          printf("key: %s\nflags: ", argv[optind]);
+        printf("%x\n", flags);
+      }
+      else 
+      {
+        if (opt_verbose)
+          printf("key: %s\nflags: %x\nlength: %zu\nvalue: ",
+                 argv[optind], flags, string_length);
+        printf("%.*s\n", (int)string_length, string);
+        free(string);
+      }
+    }
+    else
+    {
+      fprintf(stderr, "memcat: %s: memcache error %s\n", 
+              argv[optind], memcached_strerror(memc, rc));
+    }
+    optind++;
+  }
+
+  memcached_deinit(memc);
+
+  free(opt_servers);
+
+  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},
       {"help", no_argument, NULL, OPT_HELP},
@@ -40,26 +81,25 @@ 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) 
   {
-    option_rv = getopt_long(argc, argv, "", long_options, &option_index);
+    option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
     if (option_rv == -1) break;
-    switch (option_rv) {
+    switch (option_rv)
+    {
     case 0:
       break;
-    case OPT_VERSION: /* --version */
+    case OPT_VERSION: /* --version or -V */
       printf("memcache tools, memcat, v1.0\n");
       exit(0);
       break;
-    case OPT_HELP: /* --help */
+    case OPT_HELP: /* --help or -h */
       printf("useful help messages go here\n");
       exit(0);
       break;
-    case OPT_SERVERS: /* --servers */
-      opt_servers = strdup(optarg);
+    case OPT_SERVERS: /* --servers or -s */
+      opt_servers= strdup(optarg);
       break;
     case '?':
       /* getopt_long already printed an error message. */
@@ -68,30 +108,4 @@ int main(int argc, char *argv[])
       abort();
     }
   }
-
-  memc = malloc(sizeof(struct memcached_st));
-  memcached_init(memc);
-  memc= parse_opt_servers(memc, opt_servers);
-  memc= memcached_init(memc);
-
-  for (x= 1; x < argc; x++)
-  {
-    string= memcached_get(memc, argv[x], strlen(argv[x]),
-                          &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);
-	}
-      }
-    }
-  }
-
-  memcached_deinit(memc);
-
-  return 0;
-};
+}