Merge from Mark's code. Modified memcat to use enum for options.

[m6w6/libmemcached] / src / memcat.c

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