Found bug in multi get where key size was not being calculated.

[m6w6/libmemcached] / src / memcat.c

diff --git a/src/memcat.c b/src/memcat.c
index 7f3c04198435b2d45f71adcbdfcbfd19cbbef982..1c9082f55a886a101f60f7517e19de37e0571786 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -29,11 +29,19 @@ int main(int argc, char *argv[])
   options_parse(argc, argv);
 
   if (!opt_servers)
-    return 0;
+  {
+    char *temp;
 
-  memc= memcached_init(NULL);
+    if ((temp= getenv("MEMCACHED_SERVERS")))
+      opt_servers= strdup(temp);
+    else
+      exit(1);
+  }
+
+  memc= memcached_create(NULL);
+
+  servers= memcached_servers_parse(opt_servers);
 
-  servers= parse_opt_servers(opt_servers);
   memcached_server_push(memc, servers);
   memcached_server_list_free(servers);
 
@@ -58,7 +66,7 @@ int main(int argc, char *argv[])
         free(string);
       }
     }
-    else
+    else if (rc != MEMCACHED_NOTFOUND)
     {
       fprintf(stderr, "memcat: %s: memcache error %s\n", 
               argv[optind], memcached_strerror(memc, rc));
@@ -66,7 +74,7 @@ int main(int argc, char *argv[])
     optind++;
   }
 
-  memcached_deinit(memc);
+  memcached_free(memc);
 
   free(opt_servers);