fix bug in calling parse_opt_servers

[awesomized/libmemcached] / src / memrm.c

diff --git a/src/memrm.c b/src/memrm.c
index 519d93989cbb85d2ff76a38d968f8726376c1854..005a913d320b235bba18d255b4acd58bc6df2f9a 100644 (file)
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -3,64 +3,92 @@
 #include <getopt.h>\r
 #include <memcached.h>\r
 #include "client_options.h"\r
+#include "utilities.h"\r
 \r
-static int opt_verbose;\r
-static char *opt_servers;\r
+static int opt_verbose= 0;\r
+static time_t opt_expire= 0;\r
+static char *opt_servers= NULL;\r
 \r
-struct memcached_st *parse_opt_servers (struct memcached_st *m,\r
-                                       char *opt_servers)\r
-{\r
-  char *s, *hostname;\r
-  unsigned int portnum;\r
-  while (s = strsep(&opt_servers, ",")) {\r
-    hostname = strsep(&s, ":");\r
-    portnum = atoi(s);\r
-    memcached_server_add(m, hostname, portnum);\r
-  }\r
-  return m;\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
-  char *string;\r
-  size_t string_length;\r
-  time_t expires = 0;\r
   memcached_return rc;\r
 \r
-  static struct option long_options[] =\r
+  options_parse(argc, argv);\r
+\r
+  memc= memcached_init(NULL);\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
-      {"version", no_argument, NULL, OPT_VERSION},\r
-      {"help", no_argument, NULL, OPT_HELP},\r
-      {"verbose", no_argument, &opt_verbose, 1},\r
-      {"debug", no_argument, &opt_verbose, 2},\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
+      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, "", long_options, &option_index);\r
+    option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);\r
     if (option_rv == -1) break;\r
-    switch (option_rv) {\r
+    switch (option_rv)\r
+    {\r
     case 0:\r
       break;\r
-    case OPT_VERSION: /* --version */\r
+    case OPT_VERBOSE: /* --verbose or -v */\r
+      opt_verbose = OPT_VERBOSE;\r
+      break;\r
+    case OPT_DEBUG: /* --debug or -d */\r
+      opt_verbose = OPT_DEBUG;\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 */\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 */\r
-      opt_servers = strdup(optarg);\r
+    case OPT_SERVERS: /* --servers or -s */\r
+      opt_servers= strdup(optarg);\r
       break;\r
     case OPT_EXPIRE: /* --expire */\r
-      expires = (time_t)atoi(optarg);\r
+      opt_expire= (time_t)strtoll(optarg, (char **)NULL, 10);\r
       break;\r
     case '?':\r
       /* getopt_long already printed an error message. */\r
@@ -69,18 +97,4 @@ int main(int argc, char *argv[])
       abort();\r
     }\r
   }\r
-\r
-  memc= memcached_init(NULL);\r
-  memc= parse_opt_servers(memc, opt_servers);\r
-  \r
-  while (optind <= argc) {\r
-\r
-    rc = memcached_delete(memc, argv[optind], strlen(argv[optind]), expires);\r
-\r
-    optind++;\r
-  }\r
-\r
-  memcached_deinit(memc);\r
-\r
-  return 0;\r
-};\r
+}\r