X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcat.c;h=dedcb94595e5bc79f9417c0cefaffe17aeaa68f6;hb=6030db2543337976c1df861272ce90b25ef83820;hp=0fc38d6ceb20d03ed9fd667a3dd226e029e83c65;hpb=5f50148c208a764fa3c477436050356b2e24c121;p=m6w6%2Flibmemcached

diff --git a/src/memcat.c b/src/memcat.c
index 0fc38d6c..dedcb945 100644
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -1,28 +1,48 @@
 #include <stdio.h>
+#include <unistd.h>
+#include <getopt.h>
 #include <memcached.h>
 
+#include "client_options.h"
+#include "utilities.h"
+
+
+/* Prototypes */
+void options_parse(int argc, char *argv[]);
+
+static int opt_verbose;
+static int opt_displayflag;
+static char *opt_servers;
+
 int main(int argc, char *argv[])
 {
   memcached_st *memc;
   char *string;
-  unsigned int x;
   size_t string_length;
   uint16_t  flags;
   memcached_return rc;
-
-  if (argc == 1)
-    return 0;
+  unsigned int x;
 
   memc= memcached_init(NULL);
 
+  options_parse(argc, argv);
+
+  parse_opt_servers(memc, opt_servers);
+
   for (x= 1; x < argc; x++)
   {
     string= memcached_get(memc, argv[x], strlen(argv[x]),
                           &string_length, &flags, &rc);
-    if (string)
-    {
-      printf("%.*s\n", string_length, string);
-      free(string);
+    if (rc == MEMCACHED_SUCCESS) {
+      if (opt_displayflag) {
+	printf("%d\n", flags);
+      } else {
+	if (string) 
+	{
+	  printf("%.*s\n", string_length, string);
+	  free(string);
+	}
+      }
     }
   }
 
@@ -30,3 +50,47 @@ int main(int argc, char *argv[])
 
   return 0;
 };
+
+
+void options_parse(int argc, char *argv[])
+{
+  int option_index = 0;
+  int option_rv;
+
+  static struct option long_options[] =
+    {
+      {"version", no_argument, NULL, OPT_VERSION},
+      {"help", no_argument, NULL, OPT_HELP},
+      {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
+      {"debug", no_argument, &opt_verbose, OPT_DEBUG},
+      {"servers", required_argument, NULL, OPT_SERVERS},
+      {"flag", no_argument, &opt_displayflag, OPT_FLAG},
+      {0, 0, 0, 0},
+    };
+
+  while (1) 
+  {
+    option_rv = getopt_long(argc, argv, "", long_options, &option_index);
+    if (option_rv == -1) break;
+    switch (option_rv) {
+    case 0:
+      break;
+    case OPT_VERSION: /* --version */
+      printf("memcache tools, memcat, v1.0\n");
+      exit(0);
+      break;
+    case OPT_HELP: /* --help */
+      printf("useful help messages go here\n");
+      exit(0);
+      break;
+    case OPT_SERVERS: /* --servers */
+      opt_servers= strdup(optarg);
+      break;
+    case '?':
+      /* getopt_long already printed an error message. */
+      exit(1);
+    default:
+      abort();
+    }
+  }
+}