Needed to add memset to remove crashing case in memslap

[awesomized/libmemcached] / src / memrm.c

diff --git a/src/memrm.c b/src/memrm.c
index 3e468a3d875d6619621386bc2a9d5c1505c5717c..09f58ea4d76b83eeeca69c02798b0cb11b5c982f 100644 (file)
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -1,96 +1,122 @@
-#include <stdio.h>\r
-#include <unistd.h>\r
-#include <getopt.h>\r
-#include <memcached.h>\r
-#include "client_options.h"\r
-#include "utilities.h"\r
-\r
-static int opt_verbose= 0;\r
-static time_t opt_expire= 0;\r
-static char *opt_servers= NULL;\r
-\r
-/* Prototypes */\r
-void options_parse(int argc, char *argv[]);\r
-\r
-int main(int argc, char *argv[])\r
-{\r
-  memcached_st *memc;\r
-  memcached_return rc;\r
-\r
-  options_parse(argc, argv);\r
-\r
-  memc= memcached_init(NULL);\r
-\r
-  parse_opt_servers(memc, opt_servers);\r
-\r
-  if (opt_servers)\r
-    parse_opt_servers(memc, opt_servers);\r
-  \r
-  while (optind <= argc) \r
-  {\r
-    if (opt_verbose) \r
-      printf("key: %s\nexpires: %llu\n", argv[optind], (unsigned long long)opt_expire);\r
-    rc = memcached_delete(memc, argv[optind], strlen(argv[optind]), opt_expire);\r
-\r
-    if (rc != MEMCACHED_SUCCESS) \r
-    {\r
-      fprintf(stderr, "memrm: %s: memcache error %s\n", \r
-             argv[optind], memcached_strerror(memc, rc));\r
-    }\r
-\r
-    optind++;\r
-  }\r
-\r
-  memcached_deinit(memc);\r
-\r
-  free(opt_servers);\r
-\r
-  return 0;\r
-}\r
-\r
-\r
-void options_parse(int argc, char *argv[])\r
-{\r
-  static struct option long_options[]=\r
-  {\r
-    {"version", no_argument, NULL, OPT_VERSION},\r
-    {"help", no_argument, NULL, OPT_HELP},\r
-    {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},\r
-    {"debug", no_argument, &opt_verbose, OPT_DEBUG},\r
-    {"servers", required_argument, NULL, OPT_SERVERS},\r
-    {"expire", required_argument, NULL, OPT_EXPIRE},\r
-    {0, 0, 0, 0},\r
-  };\r
-  int option_index= 0;\r
-  int option_rv;\r
-\r
-  while (1) \r
-  {\r
-    option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);\r
-    if (option_rv == -1) break;\r
-    switch (option_rv)\r
-    {\r
-    case 0:\r
-      break;\r
-    case OPT_VERSION: /* --version or -V */\r
-      printf("memcache tools, memrm, v1.0\n");\r
-      exit(0);\r
-      break;\r
-    case OPT_HELP: /* --help or -h */\r
-      printf("useful help messages go here\n");\r
-      exit(0);\r
-      break;\r
-    case OPT_SERVERS: /* --servers or -s */\r
-      opt_servers= strdup(optarg);\r
-      break;\r
-    case OPT_EXPIRE: /* --expire */\r
-      opt_expire= (time_t)strtoll(optarg, (char **)NULL, 10);\r
-      break;\r
-    case '?':\r
-      /* getopt_long already printed an error message. */\r
-      exit(1);\r
-    default:\r
-      abort();\r
-    }\r
-  }\r
-}\r
+#include <stdio.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <memcached.h>
+#include <string.h>
+#include "client_options.h"
+#include "utilities.h"
+
+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[]);
+
+int main(int argc, char *argv[])
+{
+  memcached_st *memc;
+  memcached_return rc;
+  memcached_server_st *servers;
+
+  options_parse(argc, argv);
+
+  if (!opt_servers)
+  {
+    char *temp;
+
+    if ((temp= getenv("MEMCACHED_SERVERS")))
+      opt_servers= strdup(temp);
+    else
+      exit(1);
+  }
+
+  memc= memcached_create(NULL);
+
+  servers= memcached_servers_parse(opt_servers);
+  memcached_server_push(memc, servers);
+  memcached_server_list_free(servers);
+  
+  while (optind < argc) 
+  {
+    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) 
+    {
+      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));
+      fprintf(stderr, "\n");
+    }
+
+    optind++;
+  }
+
+  memcached_free(memc);
+
+  free(opt_servers);
+
+  return 0;
+}
+
+
+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},
+    {"help", no_argument, NULL, OPT_HELP},
+    {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
+    {"debug", no_argument, &opt_verbose, OPT_DEBUG},
+    {"servers", required_argument, NULL, OPT_SERVERS},
+    {"expire", required_argument, NULL, OPT_EXPIRE},
+    {0, 0, 0, 0},
+  };
+  int option_index= 0;
+  int option_rv;
+
+  while (1) 
+  {
+    option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
+    if (option_rv == -1) break;
+    switch (option_rv)
+    {
+    case 0:
+      break;
+    case OPT_VERBOSE: /* --verbose or -v */
+      opt_verbose = OPT_VERBOSE;
+      break;
+    case OPT_DEBUG: /* --debug or -d */
+      opt_verbose = OPT_DEBUG;
+      break;
+    case OPT_VERSION: /* --version or -V */
+      version_command(PROGRAM_NAME);
+      break;
+    case OPT_HELP: /* --help or -h */
+      help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, help_options);
+      break;
+    case OPT_SERVERS: /* --servers or -s */
+      opt_servers= strdup(optarg);
+      break;
+    case OPT_EXPIRE: /* --expire */
+      opt_expire= (time_t)strtoll(optarg, (char **)NULL, 10);
+      break;
+    case '?':
+      /* getopt_long already printed an error message. */
+      exit(1);
+    default:
+      abort();
+    }
+  }
+}