Removed dumb bug concerning set (was still using a buffer).

[m6w6/libmemcached] / src / memcat.c

diff --git a/src/memcat.c b/src/memcat.c
index 0b9690b2e4ee2d5e51fa2f94c8bc468f5031f5d1..4253aa00fc2663e0a4ab6804f9eb7f9d100f93c7 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -26,22 +26,35 @@ int main(int argc, char *argv[])
 \r
   options_parse(argc, argv);\r
 \r
-  parse_opt_servers(memc, opt_servers);\r
+  if (opt_servers)\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= memcached_get(memc, argv[optind], strlen(argv[optind]),\r
                           &string_length, &flags, &rc);\r
     if (rc == MEMCACHED_SUCCESS) \r
     {\r
-      if (opt_displayflag) \r
-       printf("%d\n", flags);\r
+      if (opt_displayflag)\r
+      {\r
+       if (opt_verbose)\r
+         printf("key: %s\nflags: ", argv[optind]);\r
+       printf("%u\n", flags);\r
+      }\r
       else \r
       {\r
+       if (opt_verbose)\r
+         printf("key: %s\nflags: %u\nlength: %uz\nvalue: ",\r
+                argv[optind], 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[optind], memcached_strerror(memc, rc));\r
+    }\r
     optind++;\r
   }\r
 \r
@@ -60,8 +73,8 @@ void options_parse(int argc, char *argv[])
     {\r
       {"version", no_argument, NULL, OPT_VERSION},\r
       {"help", no_argument, NULL, OPT_HELP},\r
-      {"verbose", no_argument, &opt_verbose, 1},\r
-      {"debug", no_argument, &opt_verbose, 2},\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