X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemflush.c;h=af7ab35317c7ba4e178a86b024ccd201a9ccac7a;hb=26a094f56978a505d16aef3552d5620b6cfc2528;hp=b864bf60d42023373aa3427e8b454c40474f029e;hpb=ccd00450d57624afba24bfbb6e76d1d69d0ad0f8;p=m6w6%2Flibmemcached

diff --git a/src/memflush.c b/src/memflush.c
index b864bf60..af7ab353 100644
--- a/src/memflush.c
+++ b/src/memflush.c
@@ -9,6 +9,9 @@ static int opt_verbose= 0;
 static time_t opt_expire= 0;
 static char *opt_servers= NULL;
 
+#define PROGRAM_NAME "memflush"
+#define PROGRAM_DESCRIPTION "Erase all data in a server of memcached servers."
+
 /* Prototypes */
 void options_parse(int argc, char *argv[]);
 
@@ -16,13 +19,18 @@ int main(int argc, char *argv[])
 {
   memcached_st *memc;
   memcached_return rc;
+  memcached_server_st *servers;
 
   options_parse(argc, argv);
 
-  memc= memcached_init(NULL);
+  if (!opt_servers)
+    return 0;
+
+  memc= memcached_create(NULL);
 
-  if (opt_servers)
-    parse_opt_servers(memc, opt_servers);
+  servers= parse_opt_servers(opt_servers);
+  memcached_server_push(memc, servers);
+  memcached_server_list_free(servers);
   
   rc = memcached_flush(memc, opt_expire);
   if (rc != MEMCACHED_SUCCESS) 
@@ -31,7 +39,7 @@ int main(int argc, char *argv[])
 	    memcached_strerror(memc, rc));
   }
 
-  memcached_deinit(memc);
+  memcached_free(memc);
 
   free(opt_servers);
 
@@ -41,6 +49,11 @@ int main(int argc, char *argv[])
 
 void options_parse(int argc, char *argv[])
 {
+  memcached_programs_help_st help_options[]=
+  {
+    {0},
+  };
+
   static struct option long_options[]=
   {
     {"version", no_argument, NULL, OPT_VERSION},
@@ -69,12 +82,10 @@ void options_parse(int argc, char *argv[])
       opt_verbose = OPT_DEBUG;
       break;
     case OPT_VERSION: /* --version or -V */
-      printf("memcache tools, memflush, 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);