X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcat.c;h=4aaffb95ca71f9cfa8a19bd6db5887a90d740cae;hb=3108ba67a2cb6230cb43d24608187f7201951822;hp=7f3c04198435b2d45f71adcbdfcbfd19cbbef982;hpb=7bfd925c54662cf1f67b651559dd91f77bfe8817;p=awesomized%2Flibmemcached

diff --git a/src/memcat.c b/src/memcat.c
index 7f3c0419..4aaffb95 100644
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -1,9 +1,10 @@
 #include <stdio.h>
+#include <inttypes.h>
+#include <string.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <memcached.h>
 
-#include "client_options.h"
 #include "utilities.h"
 
 #define PROGRAM_NAME "memcat"
@@ -22,18 +23,26 @@ int main(int argc, char *argv[])
   memcached_st *memc;
   char *string;
   size_t string_length;
-  uint16_t flags;
+  uint32_t flags;
   memcached_return rc;
   memcached_server_st *servers;
 
   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,15 +67,18 @@ int main(int argc, char *argv[])
         free(string);
       }
     }
-    else
+    else if (rc != MEMCACHED_NOTFOUND)
     {
-      fprintf(stderr, "memcat: %s: memcache error %s\n", 
+      fprintf(stderr, "memcat: %s: memcache error %s", 
               argv[optind], memcached_strerror(memc, rc));
+      if (memc->cached_errno)
+	fprintf(stderr, " system error %s", strerror(memc->cached_errno));
+      fprintf(stderr, "\n");
     }
     optind++;
   }
 
-  memcached_deinit(memc);
+  memcached_free(memc);
 
   free(opt_servers);