X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcat.c;h=7789ec9b4e0f72f813257c0320c441ba6adee291;hb=8a685f7ae7c61368a40cd702c55bd662c25891b2;hp=dedcb94595e5bc79f9417c0cefaffe17aeaa68f6;hpb=6030db2543337976c1df861272ce90b25ef83820;p=m6w6%2Flibmemcached

diff --git a/src/memcat.c b/src/memcat.c
index dedcb945..7789ec9b 100644
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -21,7 +21,6 @@ int main(int argc, char *argv[])
   size_t string_length;
   uint16_t  flags;
   memcached_return rc;
-  unsigned int x;
 
   memc= memcached_init(NULL);
 
@@ -29,21 +28,28 @@ int main(int argc, char *argv[])
 
   parse_opt_servers(memc, opt_servers);
 
-  for (x= 1; x < argc; x++)
+  while (optind <= argc) 
   {
-    string= memcached_get(memc, argv[x], strlen(argv[x]),
+    string= memcached_get(memc, argv[argc], strlen(argv[argc]),
                           &string_length, &flags, &rc);
-    if (rc == MEMCACHED_SUCCESS) {
-      if (opt_displayflag) {
+    if (rc == MEMCACHED_SUCCESS) 
+    {
+      if (opt_displayflag)
+      {
+	if (opt_verbose)
+	  printf("key: %.*s\nflags: ", argv[argc]);
 	printf("%d\n", flags);
-      } else {
-	if (string) 
-	{
-	  printf("%.*s\n", string_length, string);
-	  free(string);
-	}
+      }
+      else 
+      {
+	if (opt_verbose)
+	  printf("key: %.*s\nflags: %d\nlength: %d\nvalue: ",
+		 argv[argc], flags, string_length);
+        printf("%.*s\n", string_length, string);
+        free(string);
       }
     }
+    optind++;
   }
 
   memcached_deinit(memc);
@@ -61,8 +67,8 @@ void options_parse(int argc, char *argv[])
     {
       {"version", no_argument, NULL, OPT_VERSION},
       {"help", no_argument, NULL, OPT_HELP},
-      {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
-      {"debug", no_argument, &opt_verbose, OPT_DEBUG},
+      {"verbose", no_argument, &opt_verbose, 1},
+      {"debug", no_argument, &opt_verbose, 2},
       {"servers", required_argument, NULL, OPT_SERVERS},
       {"flag", no_argument, &opt_displayflag, OPT_FLAG},
       {0, 0, 0, 0},
@@ -70,21 +76,21 @@ void options_parse(int argc, char *argv[])
 
   while (1) 
   {
-    option_rv = getopt_long(argc, argv, "", long_options, &option_index);
+    option_rv = getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
     if (option_rv == -1) break;
     switch (option_rv) {
     case 0:
       break;
-    case OPT_VERSION: /* --version */
+    case OPT_VERSION: /* --version or -V */
       printf("memcache tools, memcat, v1.0\n");
       exit(0);
       break;
-    case OPT_HELP: /* --help */
+    case OPT_HELP: /* --help or -h */
       printf("useful help messages go here\n");
       exit(0);
       break;
-    case OPT_SERVERS: /* --servers */
-      opt_servers= strdup(optarg);
+    case OPT_SERVERS: /* --servers or -s */
+      opt_servers= optarg;
       break;
     case '?':
       /* getopt_long already printed an error message. */