X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcat.c;h=eb85329125c3428d59e3b49ed1b2f8a94e2cd092;hb=8a5eacba0596082949034333adbc4e01f339069b;hp=0fc38d6ceb20d03ed9fd667a3dd226e029e83c65;hpb=5f50148c208a764fa3c477436050356b2e24c121;p=awesomized%2Flibmemcached

diff --git a/src/memcat.c b/src/memcat.c
index 0fc38d6c..eb853291 100644
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -1,29 +1,92 @@
 #include <stdio.h>
+#include <unistd.h>
+#include <getopt.h>
 #include <memcached.h>
+#include "client_options.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;
+}
 
 int main(int argc, char *argv[])
 {
   memcached_st *memc;
   char *string;
-  unsigned int x;
   size_t string_length;
   uint16_t  flags;
   memcached_return rc;
 
-  if (argc == 1)
-    return 0;
-
-  memc= memcached_init(NULL);
+  static struct option long_options[] =
+    {
+      {"version", no_argument, NULL, OPT_VERSION},
+      {"help", no_argument, NULL, OPT_HELP},
+      {"verbose", no_argument, &opt_verbose, 1},
+      {"debug", no_argument, &opt_verbose, 2},
+      {"servers", required_argument, NULL, OPT_SERVERS},
+      {"flag", no_argument, &opt_displayflag, OPT_FLAG},
+      {0, 0, 0, 0},
+    };
+  int option_index = 0;
+  int option_rv;
 
-  for (x= 1; x < argc; x++)
+  while (1) 
   {
-    string= memcached_get(memc, argv[x], strlen(argv[x]),
+    option_rv = getopt_long(argc, argv, "", long_options, &option_index);
+    if (option_rv == -1) break;
+    switch (option_rv) {
+    case 0:
+      break;
+    case OPT_VERSION: /* --version */
+      printf("memcache tools, memcat, v1.0\n");
+      exit(0);
+      break;
+    case OPT_HELP: /* --help */
+      printf("useful help messages go here\n");
+      exit(0);
+      break;
+    case OPT_SERVERS: /* --servers */
+      opt_servers = strdup(optarg);
+      break;
+    case '?':
+      /* getopt_long already printed an error message. */
+      exit(1);
+    default:
+      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 (string)
-    {
-      printf("%.*s\n", string_length, string);
-      free(string);
+    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);