X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemrm.c;h=4a3da0218b5032f4f1aaab4580d5cf6f2401dfbb;hb=ca065f55235fd9979ede818963780f417d70c64e;hp=519d93989cbb85d2ff76a38d968f8726376c1854;hpb=8ed85f5e5e82146dcd869c5f260252e92bad2662;p=awesomized%2Flibmemcached

diff --git a/src/memrm.c b/src/memrm.c
index 519d9398..4a3da021 100644
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -7,19 +7,6 @@
 static int opt_verbose;
 static char *opt_servers;
 
-struct memcached_st *parse_opt_servers (struct memcached_st *m,
-					char *opt_servers)
-{
-  char *s, *hostname;
-  unsigned int portnum;
-  while (s = strsep(&opt_servers, ",")) {
-    hostname = strsep(&s, ":");
-    portnum = atoi(s);
-    memcached_server_add(m, hostname, portnum);
-  }
-  return m;
-}
-
 int main(int argc, char *argv[])
 {
   memcached_st *memc;
@@ -32,8 +19,8 @@ int main(int argc, char *argv[])
     {
       {"version", no_argument, NULL, OPT_VERSION},
       {"help", no_argument, NULL, OPT_HELP},
-      {"verbose", no_argument, &opt_verbose, 1},
-      {"debug", no_argument, &opt_verbose, 2},
+      {"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},
@@ -43,24 +30,24 @@ int main(int argc, char *argv[])
 
   while (1) 
   {
-    option_rv = getopt_long(argc, argv, "", long_options, &option_index);
+    option_rv = getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
     if (option_rv == -1) break;
     switch (option_rv) {
     case 0:
       break;
-    case OPT_VERSION: /* --version */
+    case OPT_VERSION: /* --version or -V */
       printf("memcache tools, memrm, v1.0\n");
       exit(0);
       break;
-    case OPT_HELP: /* --help */
+    case OPT_HELP: /* --help or -h */
       printf("useful help messages go here\n");
       exit(0);
       break;
-    case OPT_SERVERS: /* --servers */
-      opt_servers = strdup(optarg);
+    case OPT_SERVERS: /* --servers or -s */
+      opt_servers = optarg;
       break;
     case OPT_EXPIRE: /* --expire */
-      expires = (time_t)atoi(optarg);
+      expires = (time_t)strtol(optarg, (char **)NULL, 10);
       break;
     case '?':
       /* getopt_long already printed an error message. */
@@ -71,12 +58,20 @@ int main(int argc, char *argv[])
   }
 
   memc= memcached_init(NULL);
-  memc= parse_opt_servers(memc, opt_servers);
+  parse_opt_servers(memc, opt_servers);
   
-  while (optind <= argc) {
-
+  while (optind <= argc) 
+  {
+    if (opt_verbose) 
+      printf("key: %s\nexpires: %llu\n", argv[optind], expires);
     rc = memcached_delete(memc, argv[optind], strlen(argv[optind]), expires);
 
+    if (rc != MEMCACHED_SUCCESS) 
+    {
+      fprintf(stderr, "memrm: %s: memcache error %s\n", 
+	      argv[optind], memcached_strerror(memc, rc));
+    }
+
     optind++;
   }