X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcp.c;h=0eb210a701c13dd45ec10c29ceeeba8bd31a877e;hb=7eb4f57fd1daa46652091414e381f7842833bc6a;hp=62c6020780beb33611e1ab9d3e981f615ea53fd6;hpb=44152c2062812b74edbcad6b7bf15e78d93ed12c;p=awesomized%2Flibmemcached

diff --git a/src/memcp.c b/src/memcp.c
index 62c60207..0eb210a7 100644
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <sys/types.h>
@@ -7,6 +9,8 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <strings.h>
+#include <string.h>
+#include <assert.h>
 
 #include <memcached.h>
 #include "client_options.h"
@@ -35,12 +39,19 @@ int main(int argc, char *argv[])
   memc= memcached_create(NULL);
 
   if (!opt_servers)
-    return 0;
+  {
+    char *temp;
+
+    if ((temp= getenv("MEMCACHED_SERVERS")))
+      opt_servers= strdup(temp);
+    else
+      exit(1);
+  }
 
   if (opt_servers)
-    servers= parse_opt_servers(opt_servers);
+    servers= memcached_servers_parse(opt_servers);
   else
-    servers= parse_opt_servers(argv[--argc]);
+    servers= memcached_servers_parse(argv[--argc]);
 
   memcached_server_push(memc, servers);
   memcached_server_list_free(servers);
@@ -105,8 +116,13 @@ int main(int argc, char *argv[])
                         opt_expires, opt_flags);
 
     if (rc != MEMCACHED_SUCCESS)
-      fprintf(stderr, "memcp: %s: memcache error %s\n", 
+    {
+      fprintf(stderr, "memcp: %s: memcache error %s", 
 	      ptr, memcached_strerror(memc, rc));
+      if (memc->my_errno)
+	fprintf(stderr, " system error %s", strerror(memc->my_errno));
+      fprintf(stderr, "\n");
+    }
 
     free(file_buffer_ptr);
     close(fd);