Removed dumb bug concerning set (was still using a buffer).

[awesomized/libmemcached] / src / memrm.c

diff --git a/src/memrm.c b/src/memrm.c
index b297379f3c231fddb599fc1290afb29a4da24567..4a3da0218b5032f4f1aaab4580d5cf6f2401dfbb 100644 (file)
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -19,8 +19,8 @@ int main(int argc, char *argv[])
     {\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
+      {"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
@@ -30,20 +30,20 @@ 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
+    case OPT_SERVERS: /* --servers or -s */\r
       opt_servers = optarg;\r
       break;\r
     case OPT_EXPIRE: /* --expire */\r
@@ -62,7 +62,16 @@ int main(int argc, char *argv[])
   \r
   while (optind <= argc) \r
   {\r
+    if (opt_verbose) \r
+      printf("key: %s\nexpires: %llu\n", argv[optind], expires);\r
     rc = memcached_delete(memc, argv[optind], strlen(argv[optind]), expires);\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