This fixes the overflow size_t possible problem in the string functions (yes,

[awesomized/libmemcached] / src / memrm.c

diff --git a/src/memrm.c b/src/memrm.c
index db9929141e431947ab8f22cd96c0294e93db0f6c..acfbf53fd9bf62d60eb176bc1f9397773c141d74 100644 (file)
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -2,6 +2,7 @@
 #include <unistd.h>
 #include <getopt.h>
 #include <memcached.h>
+#include <string.h>
 #include "client_options.h"
 #include "utilities.h"
 
@@ -9,6 +10,9 @@ static int opt_verbose= 0;
 static time_t opt_expire= 0;
 static char *opt_servers= NULL;
 
+#define PROGRAM_NAME "memrm"
+#define PROGRAM_DESCRIPTION "Erase a key or set of keys from a memcached cluster."
+
 /* Prototypes */
 void options_parse(int argc, char *argv[]);
 
@@ -16,13 +20,25 @@ 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)
+  {
+    char *temp;
+
+    if ((temp= getenv("MEMCACHED_SERVERS")))
+      opt_servers= strdup(temp);
+    else
+      exit(1);
+  }
 
-  if (opt_servers)
-    parse_opt_servers(memc, opt_servers);
+  memc= memcached_create(NULL);
+
+  servers= memcached_servers_parse(opt_servers);
+  memcached_server_push(memc, servers);
+  memcached_server_list_free(servers);
   
   while (optind < argc) 
   {
@@ -32,14 +48,17 @@ int main(int argc, char *argv[])
 
     if (rc != MEMCACHED_SUCCESS) 
     {
-      fprintf(stderr, "memrm: %s: memcache error %s\n", 
+      fprintf(stderr, "memrm: %s: memcache error %s", 
              argv[optind], memcached_strerror(memc, rc));
+      if (memc->my_errno)
+       fprintf(stderr, " system error %s", strerror(memc->my_errno));
+      fprintf(stderr, "\n");
     }
 
     optind++;
   }
 
-  memcached_deinit(memc);
+  memcached_free(memc);
 
   free(opt_servers);
 
@@ -49,6 +68,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},
@@ -77,12 +101,10 @@ void options_parse(int argc, char *argv[])
       opt_verbose = OPT_DEBUG;
       break;
     case OPT_VERSION: /* --version or -V */
-      printf("memcache tools, memrm, 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);