fix bug in handling some single letter command line options

diff --git a/src/memcat.c b/src/memcat.c
index 1e7f5bf7821131aa1c63c371dc46c6caa53d7332..924b16d871e59dd0a971da35f6324b8ebe9955e5 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -90,6 +90,12 @@ void options_parse(int argc, char *argv[])
     {\r
     case 0:\r
       break;\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, memcat, v1.0\n");\r
       exit(0);\r

diff --git a/src/memcp.c b/src/memcp.c
index ec9a2fafb12a2b1bf88389cb4c6d6585c7ef5b32..d85fd44d40de298e8f346aa70c4dbb6b4ab91bcb 100644 (file)
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -62,8 +62,8 @@ int main(int argc, char *argv[])
     {\r
       static char *opstr[] = { "set", "add", "replace" };\r
       printf("op: %s\nsource file: %s\nlength: %zu\n"\r
-            "key: %s\nflags: %x\n expires: %llu\n",\r
-            opstr[opt_method], argv[optind], (size_t)sbuf.st_size,\r
+            "key: %s\nflags: %x\nexpires: %llu\n",\r
+            opstr[opt_method - OPT_SET], argv[optind], (size_t)sbuf.st_size,\r
             ptr, opt_flags, (unsigned long long)opt_expires);\r
     }\r
 \r
@@ -140,6 +140,12 @@ void options_parse(int argc, char *argv[])
     {\r
     case 0:\r
       break;\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, memcp, v1.0\n");\r
       exit(0);\r

diff --git a/src/memrm.c b/src/memrm.c
index 3e468a3d875d6619621386bc2a9d5c1505c5717c..1fa9f409b08703cc93741e43e4fad826a143b87b 100644 (file)
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -72,6 +72,12 @@ void options_parse(int argc, char *argv[])
     {\r
     case 0:\r
       break;\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

diff --git a/src/memstat.c b/src/memstat.c
index e7810200db7736f721f7380e57a8c6ed0dc14704..a01c35baada79964e2275d4cec7fe94e99e2e1c3 100644 (file)
--- a/src/memstat.c
+++ b/src/memstat.c
@@ -56,6 +56,12 @@ void options_parse(int argc, char *argv[])
     {
     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 */
       printf("memcache tools, memcat, v1.0\n");
       exit(0);