X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemflush.c;h=3c47fc3cd24e22c80479d7313167f2ce81881bd5;hb=b01ff6189633c1bf86f94065d2564810e6871869;hp=a1a9ccadb527cbe42c533db61c047ee84804211c;hpb=113160884d25c401dc352cfab093b5b7b1a4fde0;p=m6w6%2Flibmemcached

diff --git a/src/memflush.c b/src/memflush.c
index a1a9ccad..3c47fc3c 100644
--- a/src/memflush.c
+++ b/src/memflush.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <string.h>
 #include <getopt.h>
 #include <memcached.h>
 #include "client_options.h"
@@ -9,6 +10,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[]);
 
@@ -21,22 +25,32 @@ 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);
   
   rc = memcached_flush(memc, opt_expire);
   if (rc != MEMCACHED_SUCCESS) 
   {
-    fprintf(stderr, "memflush: memcache error %s\n", 
+    fprintf(stderr, "memflush: memcache error %s", 
 	    memcached_strerror(memc, rc));
+    if (memc->cached_errno)
+      fprintf(stderr, " system error %s", strerror(memc->cached_errno));
+    fprintf(stderr, "\n");
   }
 
-  memcached_deinit(memc);
+  memcached_free(memc);
 
   free(opt_servers);
 
@@ -46,6 +60,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},
@@ -74,12 +93,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);