add error reporting to tools, and link memcached_strerror into library

[m6w6/libmemcached] / src / memcat.c

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