X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemrm.c;h=d4d93c2e9c2621e80b3bc56613889f715802f231;hb=1c8df302c16c766ef628eb4adfcac4ac30437026;hp=e7525fd5b6912edb438001eb379b4eed98d3c5e4;hpb=521e830fe336a17bee6e7376e3bf01a3b35ddc37;p=awesomized%2Flibmemcached

diff --git a/clients/memrm.c b/clients/memrm.c
index e7525fd5..d4d93c2e 100644
--- a/clients/memrm.c
+++ b/clients/memrm.c
@@ -8,8 +8,8 @@
  * Summary:
  *
  */
+#include "config.h"
 
-#include "libmemcached/common.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>
@@ -23,12 +23,14 @@ static int opt_verbose= 0;
 static time_t opt_expire= 0;
 static char *opt_servers= NULL;
 static char *opt_hash= NULL;
+static char *opt_username;
+static char *opt_passwd;
 
 #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[]);
+static void options_parse(int argc, char *argv[]);
 
 int main(int argc, char *argv[])
 {
@@ -36,7 +38,10 @@ int main(int argc, char *argv[])
   memcached_return_t rc;
   memcached_server_st *servers;
 
+  int return_code= 0;
+
   options_parse(argc, argv);
+  initialize_sockets();
 
   if (!opt_servers)
   {
@@ -59,20 +64,28 @@ int main(int argc, char *argv[])
   memcached_server_list_free(servers);
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
                          (uint64_t) opt_binary);
-  
-  while (optind < argc) 
+
+  if (!initialize_sasl(memc, opt_username, opt_passwd))
+  {
+    memcached_free(memc);
+    return EXIT_FAILURE;
+  }
+
+  while (optind < argc)
   {
-    if (opt_verbose) 
+    if (opt_verbose)
       printf("key: %s\nexpires: %llu\n", argv[optind], (unsigned long long)opt_expire);
     rc = memcached_delete(memc, argv[optind], strlen(argv[optind]), opt_expire);
 
-    if (rc != MEMCACHED_SUCCESS) 
+    if (rc != MEMCACHED_SUCCESS)
     {
-      fprintf(stderr, "memrm: %s: memcache error %s", 
+      fprintf(stderr, "memrm: %s: memcache error %s",
 	      argv[optind], memcached_strerror(memc, rc));
-      if (memc->cached_errno)
-	fprintf(stderr, " system error %s", strerror(memc->cached_errno));
+      if (memcached_last_error_errno(memc))
+	fprintf(stderr, " system error %s", strerror(memcached_last_error_errno(memc)));
       fprintf(stderr, "\n");
+
+      return_code= -1;
     }
 
     optind++;
@@ -82,14 +95,17 @@ int main(int argc, char *argv[])
 
   if (opt_servers)
     free(opt_servers);
+
   if (opt_hash)
     free(opt_hash);
 
-  return 0;
+  shutdown_sasl();
+
+  return return_code;
 }
 
 
-void options_parse(int argc, char *argv[])
+static void options_parse(int argc, char *argv[])
 {
   memcached_programs_help_st help_options[]=
   {
@@ -106,12 +122,14 @@ void options_parse(int argc, char *argv[])
     {(OPTIONSTRING)"expire", required_argument, NULL, OPT_EXPIRE},
     {(OPTIONSTRING)"hash", required_argument, NULL, OPT_HASH},
     {(OPTIONSTRING)"binary", no_argument, NULL, OPT_BINARY},
+    {(OPTIONSTRING)"username", required_argument, NULL, OPT_USERNAME},
+    {(OPTIONSTRING)"password", required_argument, NULL, OPT_PASSWD},
     {0, 0, 0, 0},
   };
   int option_index= 0;
   int option_rv;
 
-  while (1) 
+  while (1)
   {
     option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
     if (option_rv == -1) break;
@@ -143,6 +161,12 @@ void options_parse(int argc, char *argv[])
     case OPT_HASH:
       opt_hash= strdup(optarg);
       break;
+    case OPT_USERNAME:
+      opt_username= optarg;
+      break;
+    case OPT_PASSWD:
+      opt_passwd= optarg;
+      break;
     case '?':
       /* getopt_long already printed an error message. */
       exit(1);