Fixing broken memstat application

[m6w6/libmemcached] / src / memcp.c

diff --git a/src/memcp.c b/src/memcp.c
index 3cc0109ab4974e827b50381c7233441ea80bf993..62c6020780beb33611e1ab9d3e981f615ea53fd6 100644 (file)
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -12,6 +12,9 @@
 #include "client_options.h"
 #include "utilities.h"
 
+#define PROGRAM_NAME "memcp"
+#define PROGRAM_DESCRIPTION "Copy a set of files to a memcached cluster."
+
 /* Prototypes */
 void options_parse(int argc, char *argv[]);
 
@@ -25,15 +28,22 @@ int main(int argc, char *argv[])
 {
   memcached_st *memc;
   memcached_return rc;
+  memcached_server_st *servers;
 
   options_parse(argc, argv);
 
-  memc= memcached_init(NULL);
+  memc= memcached_create(NULL);
+
+  if (!opt_servers)
+    return 0;
 
   if (opt_servers)
-    parse_opt_servers(memc, opt_servers);
+    servers= parse_opt_servers(opt_servers);
   else
-    parse_opt_servers(memc, argv[--argc]);
+    servers= parse_opt_servers(argv[--argc]);
+
+  memcached_server_push(memc, servers);
+  memcached_server_list_free(servers);
 
   while (optind < argc) 
   {
@@ -103,7 +113,7 @@ int main(int argc, char *argv[])
     optind++;
   }
 
-  memcached_deinit(memc);
+  memcached_free(memc);
 
   free(opt_servers);
 
@@ -115,6 +125,11 @@ void options_parse(int argc, char *argv[])
   int option_index= 0;
   int option_rv;
 
+  memcached_programs_help_st help_options[]=
+  {
+    {0},
+  };
+
   static struct option long_options[]=
     {
       {"version", no_argument, NULL, OPT_VERSION},
@@ -147,11 +162,11 @@ void options_parse(int argc, char *argv[])
       opt_verbose = OPT_DEBUG;
       break;
     case OPT_VERSION: /* --version or -V */
-      printf("memcache tools, memcp, v1.0\n");
-      exit(0);
+      version_command(PROGRAM_NAME);
+      break;
     case OPT_HELP: /* --help or -h */
-      printf("useful help messages go here\n");
-      exit(0);
+      help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, help_options);
+      break;
     case OPT_SERVERS: /* --servers or -s */
       opt_servers= strdup(optarg);
       break;