fix bug in memcat

[m6w6/libmemcached] / src / memcat.c

diff --git a/src/memcat.c b/src/memcat.c
index 11b42d7d4aec9ddb7b743effc292418a32c0df31..1a6e38988b17f864d0f68aa434c35dc6972abba8 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -30,18 +30,30 @@ int main(int argc, char *argv[])
 \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
+      if (opt_displayflag)\r
+      {\r
+       if (opt_verbose)\r
+         printf("key: %.*s\nflags: ", argv[optind]);\r
        printf("%d\n", flags);\r
+      }\r
       else \r
       {\r
+       if (opt_verbose)\r
+         printf("key: %.*s\nflags: %d\nlength: %d\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
@@ -69,20 +81,20 @@ void options_parse(int argc, char *argv[])
 \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
+    case OPT_SERVERS: /* --servers or -s */\r
       opt_servers= optarg;\r
       break;\r
     case '?':\r