X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemstat.c;h=6f3c55d80fee6dffa79c6e283090b01cc5537cce;hb=99803a66dda300ea7a5741fe8aae852e8b746366;hp=8ba59d11b923d4c4c2f59f9fd9f11461f595eab7;hpb=7bfd925c54662cf1f67b651559dd91f77bfe8817;p=awesomized%2Flibmemcached

diff --git a/src/memstat.c b/src/memstat.c
index 8ba59d11..6f3c55d8 100644
--- a/src/memstat.c
+++ b/src/memstat.c
@@ -4,6 +4,8 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <fcntl.h>
+#include <string.h>
+#include <assert.h>
 #include <getopt.h>
 
 #include <memcached.h>
@@ -33,17 +35,24 @@ int main(int argc, char *argv[])
   options_parse(argc, argv);
 
   if (!opt_servers)
-    return 0;
+  {
+    char *temp;
+
+    if ((temp= getenv("MEMCACHED_SERVERS")))
+      opt_servers= strdup(temp);
+    else
+      exit(1);
+  }
 
-  memc= memcached_init(NULL);
+  memc= memcached_create(NULL);
 
-  servers= parse_opt_servers(opt_servers);
+  servers= memcached_servers_parse(opt_servers);
   memcached_server_push(memc, servers);
   memcached_server_list_free(servers);
 
   stat= memcached_stat(memc, NULL, &rc);
 
-  if (rc != MEMCACHED_SUCCESS || rc != MEMCACHED_SOME_ERRORS);
+  if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_SOME_ERRORS)
   {
     printf("Failure to communicate with servers (%s)\n",
 	   memcached_strerror(memc, rc));
@@ -80,7 +89,7 @@ int main(int argc, char *argv[])
   free(stat);
   free(opt_servers);
 
-  memcached_deinit(memc);
+  memcached_free(memc);
 
   return 0;
 }