Test cases now pass

[m6w6/libmemcached] / src / memcat.c

diff --git a/src/memcat.c b/src/memcat.c
index dedcb94595e5bc79f9417c0cefaffe17aeaa68f6..11b42d7d4aec9ddb7b743effc292418a32c0df31 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -21,7 +21,6 @@ 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
@@ -29,21 +28,21 @@ int main(int argc, char *argv[])
 \r
   parse_opt_servers(memc, opt_servers);\r
 \r
-  for (x= 1; x < argc; x++)\r
+  while (optind <= argc) \r
   {\r
-    string= memcached_get(memc, argv[x], strlen(argv[x]),\r
+    string= memcached_get(memc, argv[argc], strlen(argv[argc]),\r
                           &string_length, &flags, &rc);\r
-    if (rc == MEMCACHED_SUCCESS) {\r
-      if (opt_displayflag) {\r
+    if (rc == MEMCACHED_SUCCESS) \r
+    {\r
+      if (opt_displayflag) \r
        printf("%d\n", flags);\r
-      } else {\r
-       if (string) \r
-       {\r
-         printf("%.*s\n", string_length, string);\r
-         free(string);\r
-       }\r
+      else \r
+      {\r
+        printf("%.*s\n", string_length, string);\r
+        free(string);\r
       }\r
     }\r
+    optind++;\r
   }\r
 \r
   memcached_deinit(memc);\r
@@ -61,8 +60,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, 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
@@ -84,7 +83,7 @@ void options_parse(int argc, char *argv[])
       exit(0);\r
       break;\r
     case OPT_SERVERS: /* --servers */\r
-      opt_servers= strdup(optarg);\r
+      opt_servers= optarg;\r
       break;\r
     case '?':\r
       /* getopt_long already printed an error message. */\r