add single letter command line options

[m6w6/libmemcached] / src / memrm.c

diff --git a/src/memrm.c b/src/memrm.c
index 519d93989cbb85d2ff76a38d968f8726376c1854..5b6474b0e4a6d03288db1f85544ed90d3a681497 100644 (file)
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -7,19 +7,6 @@
 static int opt_verbose;\r
 static char *opt_servers;\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
-\r
 int main(int argc, char *argv[])\r
 {\r
   memcached_st *memc;\r
@@ -43,24 +30,24 @@ int main(int argc, char *argv[])
 \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
     case 0:\r
       break;\r
-    case OPT_VERSION: /* --version */\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 = optarg;\r
       break;\r
     case OPT_EXPIRE: /* --expire */\r
-      expires = (time_t)atoi(optarg);\r
+      expires = (time_t)strtol(optarg, (char **)NULL, 10);\r
       break;\r
     case '?':\r
       /* getopt_long already printed an error message. */\r
@@ -71,12 +58,11 @@ int main(int argc, char *argv[])
   }\r
 \r
   memc= memcached_init(NULL);\r
-  memc= parse_opt_servers(memc, opt_servers);\r
+  parse_opt_servers(memc, opt_servers);\r
   \r
-  while (optind <= argc) {\r
-\r
+  while (optind <= argc) \r
+  {\r
     rc = memcached_delete(memc, argv[optind], strlen(argv[optind]), expires);\r
-\r
     optind++;\r
   }\r
 \r