Test cases now pass

[m6w6/libmemcached] / src / memcp.c

diff --git a/src/memcp.c b/src/memcp.c
index 7f49d4da54415e23d5638dfa43a25acad51a5b9a..88cbc351372588341757f1caecd46a4127ba7845 100644 (file)
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -10,53 +10,102 @@
 #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
-\r
-struct memcached_st *parse_opt_servers (struct memcached_st *m,\r
-                                       char *opt_servers)\r
-{\r
-  char *s, *hostname;\r
-  unsigned int portnum;\r
-  while (s = strsep(&opt_servers, ",")) {\r
-    hostname = strsep(&s, ":");\r
-    portnum = atoi(s);\r
-    memcached_server_add(m, hostname, portnum);\r
-  }\r
-  return m;\r
-}\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 = 0;\r
-  time_t expires = 0;\r
   memcached_return rc;\r
 \r
+  options_parse(argc, argv);\r
+\r
+  memc= memcached_init(NULL);\r
+  parse_opt_servers(memc, opt_servers);\r
+\r
+  while (optind <= argc) \r
+  {\r
+    char *mptr;\r
+    struct stat sbuf;\r
+    int fd;\r
+    char *ptr;\r
+\r
+    fd= open(argv[optind], O_RDONLY);\r
+\r
+    if (fd == -1)\r
+    {\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[optind], '/');\r
+    if (ptr)\r
+      ptr++;\r
+    else\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, 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
       {"flag", required_argument, NULL, OPT_FLAG},\r
       {"expire", required_argument, NULL, OPT_EXPIRE},\r
-      {"set",  no_argument, &opt_replace, 0},\r
-      {"add",  no_argument, &opt_replace, 1},\r
-      {"replace",  no_argument, &opt_replace, 2},\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
-  int option_index = 0;\r
-  int option_rv;\r
+\r
   while (1) \r
   {\r
-    option_rv = getopt_long(argc, argv, "", long_options, &option_index);\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
@@ -64,19 +113,17 @@ int main(int argc, char *argv[])
     case OPT_VERSION: /* --version */\r
       printf("memcache tools, memcp, v1.0\n");\r
       exit(0);\r
-      break;\r
     case OPT_HELP: /* --help */\r
       printf("useful help messages go here\n");\r
       exit(0);\r
-      break;\r
     case OPT_SERVERS: /* --servers */\r
-      opt_servers = strdup(optarg);\r
+      opt_servers= optarg;\r
       break;\r
     case OPT_FLAG: /* --flag */\r
-      flags = (uint16_t) atoi(optarg);\r
+      opt_flags= (uint16_t)strtol(optarg, (char **)NULL, 10);\r
       break;\r
     case OPT_EXPIRE: /* --expire */\r
-      expires = (time_t)atoi(optarg);\r
+      opt_expires= (time_t)strtol(optarg, (char **)NULL, 10);\r
       break;\r
     case '?':\r
       /* getopt_long already printed an error message. */\r
@@ -85,47 +132,4 @@ int main(int argc, char *argv[])
       abort();\r
     }\r
   }\r
-\r
-  memc= memcached_init(NULL);\r
-  memc= parse_opt_servers(memc, opt_servers);\r
-\r
-  while (optind < argc) {\r
-    char *mptr;\r
-    struct stat sbuf;\r
-    int fd;\r
-    char *ptr;\r
-\r
-    fd= open(argv[optind], O_RDONLY);\r
-\r
-    if (fd == -1)\r
-    {\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[optind], '/');\r
-    if (ptr)\r
-    {\r
-      ptr++;\r
-    }\r
-    else\r
-    {\r
-      ptr= argv[optind];\r
-    }\r
-    \r
-    rc= memcached_set(memc, ptr, strlen(ptr),\r
-                      mptr, sbuf.st_size,\r
-                      expires, flags);\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