X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcat.c;h=1e7f5bf7821131aa1c63c371dc46c6caa53d7332;hb=875200dc0c5668bba4f8a68b487f9d2f2a1eedb0;hp=4253aa00fc2663e0a4ab6804f9eb7f9d100f93c7;hpb=ca065f55235fd9979ede818963780f417d70c64e;p=awesomized%2Flibmemcached

diff --git a/src/memcat.c b/src/memcat.c
index 4253aa00..1e7f5bf7 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,7 +19,7 @@ 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);
@@ -37,39 +37,41 @@ int main(int argc, char *argv[])
     {
       if (opt_displayflag)
       {
-	if (opt_verbose)
-	  printf("key: %s\nflags: ", argv[optind]);
-	printf("%u\n", flags);
+        if (opt_verbose)
+          printf("key: %s\nflags: ", argv[optind]);
+        printf("%x\n", flags);
       }
       else 
       {
-	if (opt_verbose)
-	  printf("key: %s\nflags: %u\nlength: %uz\nvalue: ",
-		 argv[optind], flags, string_length);
-        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));
+              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},
@@ -82,9 +84,10 @@ void options_parse(int argc, char *argv[])
 
   while (1) 
   {
-    option_rv = getopt_long(argc, argv, "Vhvds:", 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 or -V */
@@ -96,7 +99,7 @@ void options_parse(int argc, char *argv[])
       exit(0);
       break;
     case OPT_SERVERS: /* --servers or -s */
-      opt_servers= optarg;
+      opt_servers= strdup(optarg);
       break;
     case '?':
       /* getopt_long already printed an error message. */