X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcat.c;h=d336067687992108c0eeaeb91d700b228370038f;hb=f2db40d14786c1eb328c5762708baef0228bd4d9;hp=11b42d7d4aec9ddb7b743effc292418a32c0df31;hpb=6d0bec130624e22e695dbf4038fbeed9e1c26c60;p=m6w6%2Flibmemcached

diff --git a/src/memcat.c b/src/memcat.c
index 11b42d7d..d3360676 100644
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -10,8 +10,8 @@
 /* Prototypes */
 void options_parse(int argc, char *argv[]);
 
-static int opt_verbose;
-static int opt_displayflag;
+static int opt_verbose= 0;
+static int opt_displayflag= 0;
 static char *opt_servers;
 
 int main(int argc, char *argv[])
@@ -19,49 +19,64 @@ int main(int argc, char *argv[])
   memcached_st *memc;
   char *string;
   size_t string_length;
-  uint16_t  flags;
+  uint16_t flags;
   memcached_return rc;
 
   memc= memcached_init(NULL);
 
   options_parse(argc, argv);
 
-  parse_opt_servers(memc, opt_servers);
+  if (opt_servers)
+    parse_opt_servers(memc, opt_servers);
 
-  while (optind <= argc) 
+  while (optind < argc) 
   {
-    string= memcached_get(memc, argv[argc], strlen(argv[argc]),
+    string= memcached_get(memc, argv[optind], strlen(argv[optind]),
                           &string_length, &flags, &rc);
     if (rc == MEMCACHED_SUCCESS) 
     {
-      if (opt_displayflag) 
-	printf("%d\n", flags);
+      if (opt_displayflag)
+      {
+        if (opt_verbose)
+          printf("key: %s\nflags: ", argv[optind]);
+        printf("%x\n", flags);
+      }
       else 
       {
-        printf("%.*s\n", string_length, string);
+        if (opt_verbose)
+          printf("key: %s\nflags: %x\nlength: %zu\nvalue: ",
+                 argv[optind], flags, string_length);
+        printf("%.*s\n", (int)string_length, string);
         free(string);
       }
     }
+    else
+    {
+      fprintf(stderr, "memcat: %s: memcache error %s\n", 
+              argv[optind], memcached_strerror(memc, rc));
+    }
     optind++;
   }
 
   memcached_deinit(memc);
 
+  free(opt_servers);
+
   return 0;
 };
 
 
 void options_parse(int argc, char *argv[])
 {
-  int option_index = 0;
+  int option_index= 0;
   int option_rv;
 
-  static struct option long_options[] =
+  static struct option long_options[]=
     {
       {"version", no_argument, NULL, OPT_VERSION},
       {"help", no_argument, NULL, OPT_HELP},
-      {"verbose", no_argument, &opt_verbose, 1},
-      {"debug", no_argument, &opt_verbose, 2},
+      {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
+      {"debug", no_argument, &opt_verbose, OPT_DEBUG},
       {"servers", required_argument, NULL, OPT_SERVERS},
       {"flag", no_argument, &opt_displayflag, OPT_FLAG},
       {0, 0, 0, 0},
@@ -69,21 +84,28 @@ 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) {
+    switch (option_rv)
+    {
     case 0:
       break;
-    case OPT_VERSION: /* --version */
+    case OPT_VERBOSE: /* --verbose or -v */
+      opt_verbose = OPT_VERBOSE;
+      break;
+    case OPT_DEBUG: /* --debug or -d */
+      opt_verbose = OPT_DEBUG;
+      break;
+    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= optarg;
+    case OPT_SERVERS: /* --servers or -s */
+      opt_servers= strdup(optarg);
       break;
     case '?':
       /* getopt_long already printed an error message. */