Test cases now pass

[m6w6/libmemcached] / src / memcp.c

diff --git a/src/memcp.c b/src/memcp.c
index 3430ab54ad935be6815ef7b8dfc28ddd338f9c26..88cbc351372588341757f1caecd46a4127ba7845 100644 (file)
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -1,4 +1,6 @@
 #include <stdio.h>\r
+#include <unistd.h>\r
+#include <getopt.h>\r
 #include <sys/types.h>\r
 #include <sys/stat.h>\r
 #include <sys/types.h>\r
@@ -6,87 +8,128 @@
 #include <fcntl.h>\r
 \r
 #include <memcached.h>\r
+#include "client_options.h"\r
+\r
+/* Prototypes */\r
+void options_parse(int argc, char *argv[]);\r
+\r
+static int opt_verbose;\r
+static char *opt_servers;\r
+static int opt_replace;\r
+uint16_t opt_flags= 0;\r
+time_t opt_expires= 0;\r
 \r
 int main(int argc, char *argv[])\r
 {\r
   memcached_st *memc;\r
   char *string;\r
-  unsigned int x;\r
   size_t string_length;\r
-  uint16_t  flags;\r
   memcached_return rc;\r
 \r
-  if (argc < 3)\r
-    return 0;\r
+  options_parse(argc, argv);\r
 \r
   memc= memcached_init(NULL);\r
+  parse_opt_servers(memc, opt_servers);\r
 \r
-  /* Get the server name */\r
-  {\r
-    char *ptr;\r
-    char *hostname;\r
-    size_t hostname_length;\r
-    unsigned int port;\r
-\r
-    ptr= index(argv[argc-1], ':');\r
-\r
-    if (ptr)\r
-    {\r
-      hostname_length= ptr - argv[argc-1];\r
-      hostname= (char *)malloc(hostname_length+1);\r
-      memset(hostname, 0, hostname_length+1);\r
-      memcpy(hostname, argv[argc-1], hostname_length);\r
-\r
-      ptr++;\r
-\r
-      port= strtol(ptr, (char **)NULL, 10);\r
-\r
-      memcached_server_add(memc, hostname, port);\r
-      free(hostname);\r
-    }\r
-    else\r
-    {\r
-      memcached_server_add(memc, argv[argc -1], 0);\r
-    }\r
-  }\r
-\r
-  for (x= 1; x < argc-1; x++)\r
+  while (optind <= argc) \r
   {\r
     char *mptr;\r
     struct stat sbuf;\r
     int fd;\r
     char *ptr;\r
 \r
-    fd= open(argv[x], O_RDONLY);\r
+    fd= open(argv[optind], O_RDONLY);\r
 \r
     if (fd == -1)\r
     {\r
-      fprintf(stderr, "Failed opening %s\n", argv[x]);\r
-      exit(1);\r
+      fprintf(stderr, "Failed opening %s\n", argv[optind]);\r
+      continue;\r
     }\r
 \r
     (void)fstat(fd, &sbuf);\r
     mptr= mmap(NULL, sbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);\r
 \r
-    ptr= rindex(argv[x], '/');\r
+    ptr= rindex(argv[optind], '/');\r
     if (ptr)\r
-    {\r
       ptr++;\r
-    }\r
     else\r
-    {\r
-      ptr= argv[x];\r
-    }\r
-    \r
-    rc= memcached_set(memc, ptr, strlen(ptr),\r
-                      mptr, sbuf.st_size,\r
-                      (time_t)0, (uint16_t)0);\r
+      ptr= argv[optind];\r
+\r
+    if (opt_replace == 0)\r
+      rc= memcached_set(memc, ptr, strlen(ptr),\r
+                       mptr, sbuf.st_size,\r
+                       opt_expires, opt_flags);\r
+    else if (opt_replace == 1)\r
+      rc= memcached_add(memc, ptr, strlen(ptr),\r
+                       mptr, sbuf.st_size,\r
+                       opt_expires, opt_flags);\r
+    else if (opt_replace == 2)\r
+      rc= memcached_replace(memc, ptr, strlen(ptr),\r
+                           mptr, sbuf.st_size,\r
+                           opt_expires, opt_flags);\r
+    else\r
+      abort();\r
 \r
     munmap(mptr, sbuf.st_size);\r
     close(fd);\r
+    optind++;\r
   }\r
 \r
   memcached_deinit(memc);\r
 \r
   return 0;\r
 };\r
+\r
+void options_parse(int argc, char *argv[])\r
+{\r
+  int option_index= 0;\r
+  int option_rv;\r
+\r
+  static struct option long_options[] =\r
+    {\r
+      {"version", no_argument, NULL, OPT_VERSION},\r
+      {"help", no_argument, NULL, OPT_HELP},\r
+      {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},\r
+      {"debug", no_argument, &opt_verbose, OPT_DEBUG},\r
+      {"servers", required_argument, NULL, OPT_SERVERS},\r
+      {"flag", required_argument, NULL, OPT_FLAG},\r
+      {"expire", required_argument, NULL, OPT_EXPIRE},\r
+      {"set",  no_argument, &opt_replace, OPT_SET},\r
+      {"add",  no_argument, &opt_replace, OPT_ADD},\r
+      {"replace",  no_argument, &opt_replace, OPT_REPLACE},\r
+      {0, 0, 0, 0},\r
+    };\r
+\r
+  while (1) \r
+  {\r
+    option_rv= getopt_long(argc, argv, "", 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
+      printf("memcache tools, memcp, v1.0\n");\r
+      exit(0);\r
+    case OPT_HELP: /* --help */\r
+      printf("useful help messages go here\n");\r
+      exit(0);\r
+    case OPT_SERVERS: /* --servers */\r
+      opt_servers= optarg;\r
+      break;\r
+    case OPT_FLAG: /* --flag */\r
+      opt_flags= (uint16_t)strtol(optarg, (char **)NULL, 10);\r
+      break;\r
+    case OPT_EXPIRE: /* --expire */\r
+      opt_expires= (time_t)strtol(optarg, (char **)NULL, 10);\r
+      break;\r
+    case '?':\r
+      /* getopt_long already printed an error message. */\r
+      exit(1);\r
+    default:\r
+      abort();\r
+    }\r
+  }\r
+}\r