add single letter command line options

 -V for --version
 -h for --help
 -v for --verbose
 -d for --debug
 -s for --servers

diff --git a/src/client_options.h b/src/client_options.h
index 6dd4313573d0012a875be531957b9d1b833e0e47..204135aa8097445bbae63e735c29cd1f80c7b198 100644 (file)
--- a/src/client_options.h
+++ b/src/client_options.h
@@ -1,10 +1,10 @@
 typedef enum {
-  OPT_SERVERS= 1,
-  OPT_VERSION,
-  OPT_HELP,
-  OPT_VERBOSE,
-  OPT_DEBUG,
-  OPT_FLAG,
+  OPT_SERVERS= 's',
+  OPT_VERSION= 'V',
+  OPT_HELP= 'h',
+  OPT_VERBOSE= 'v',
+  OPT_DEBUG= 'd',
+  OPT_FLAG= 257,
   OPT_EXPIRE,
   OPT_SET,
   OPT_REPLACE,

diff --git a/src/memcat.c b/src/memcat.c
index 11b42d7d4aec9ddb7b743effc292418a32c0df31..0b9690b2e4ee2d5e51fa2f94c8bc468f5031f5d1 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -69,20 +69,20 @@ void options_parse(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, memcat, 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 '?':\r

diff --git a/src/memcp.c b/src/memcp.c
index 88cbc351372588341757f1caecd46a4127ba7845..90d3fb375b574f2a5abb690e683085ef44753f0a 100644 (file)
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -102,21 +102,20 @@ void options_parse(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
 \r
     if (option_rv == -1) break;\r
 \r
     switch (option_rv) {\r
     case 0:\r
-      if (long_options[option_index].name)\r
       break;\r
-    case OPT_VERSION: /* --version */\r
+    case OPT_VERSION: /* --version or -V */\r
       printf("memcache tools, memcp, v1.0\n");\r
       exit(0);\r
-    case OPT_HELP: /* --help */\r
+    case OPT_HELP: /* --help or -h */\r
       printf("useful help messages go here\n");\r
       exit(0);\r
-    case OPT_SERVERS: /* --servers */\r
+    case OPT_SERVERS: /* --servers or -s */\r
       opt_servers= optarg;\r
       break;\r
     case OPT_FLAG: /* --flag */\r

diff --git a/src/memrm.c b/src/memrm.c
index b297379f3c231fddb599fc1290afb29a4da24567..5b6474b0e4a6d03288db1f85544ed90d3a681497 100644 (file)
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -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

diff --git a/src/memstat.c b/src/memstat.c
index 76fdd9c6dde3e308d3bbaedf0f4a8b3c409ff76b..dcfb3af96ea15ec725170e18da546c62eb76c653 100644 (file)
--- a/src/memstat.c
+++ b/src/memstat.c
@@ -50,20 +50,20 @@ void options_parse(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, memcat, 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 */
+    case OPT_SERVERS: /* --servers or -s */
       opt_servers = optarg;
       break;
     case '?':