Removed dumb bug concerning set (was still using a buffer).

[m6w6/libmemcached] / src / memcp.c

diff --git a/src/memcp.c b/src/memcp.c
index fc396ff1b09c4b4163bc3040802ccd8d42b8f5bb..bba346b973f047856fb1eff95df45e0f8ff177c9 100644 (file)
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -4,7 +4,6 @@
 #include <sys/types.h>\r
 #include <sys/stat.h>\r
 #include <sys/types.h>\r
-#include <sys/mman.h>\r
 #include <fcntl.h>\r
 #include <errno.h>\r
 \r
@@ -14,9 +13,9 @@
 /* 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
+static int opt_verbose= 0;\r
+static char *opt_servers= NULL;\r
+static int opt_method= 0;\r
 uint16_t opt_flags= 0;\r
 time_t opt_expires= 0;\r
 \r
@@ -26,34 +25,31 @@ int main(int argc, char *argv[])
   char *string;\r
   size_t string_length;\r
   memcached_return rc;\r
-\r
   options_parse(argc, argv);\r
 \r
   memc= memcached_init(NULL);\r
-  parse_opt_servers(memc, opt_servers);\r
+  if (opt_servers)\r
+    parse_opt_servers(memc, opt_servers);\r
+  else\r
+    parse_opt_servers(memc, argv[--argc]);\r
 \r
-  while (optind <= argc) \r
+  while (optind < argc) \r
   {\r
-    char *mptr;\r
     struct stat sbuf;\r
     int fd;\r
     char *ptr;\r
+    ssize_t read_length;\r
+    char *file_buffer_ptr;\r
 \r
     fd= open(argv[optind], O_RDONLY);\r
-    if (fd < 0) {\r
+    if (fd < 0) \r
+    {\r
       fprintf(stderr, "memcp: %s: %s\n", argv[optind], strerror(errno));\r
       optind++;\r
       continue;\r
     }\r
 \r
     (void)fstat(fd, &sbuf);\r
-    mptr= mmap(NULL, sbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);\r
-    if (mptr == MAP_FAILED) {\r
-      fprintf(stderr, "memcp: %s: %s\n", argv[optind], strerror(errno));\r
-      close(fd);\r
-      optind++;\r
-      continue;\r
-    }\r
 \r
     ptr= rindex(argv[optind], '/');\r
     if (ptr)\r
@@ -61,41 +57,55 @@ int main(int argc, char *argv[])
     else\r
       ptr= argv[optind];\r
 \r
-    if (opt_verbose) {\r
+    if (opt_verbose) \r
+    {\r
       static char *opstr[] = { "set", "add", "replace" };\r
-      printf("op: %s\nsource file: %s\nlength: %d\n"\r
-            "key: %s\nflags: %d\n expires: %ld\n",\r
-            opstr[opt_replace], argv[optind], sbuf.st_size,\r
+      printf("op: %s\nsource file: %s\nlength: %zu\n"\r
+            "key: %s\nflags: %u\n expires: %llu\n",\r
+            opstr[opt_method], argv[optind], sbuf.st_size,\r
             ptr, opt_flags, opt_expires);\r
     }\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
+    if ((file_buffer_ptr= (char *)malloc(sizeof(char) * sbuf.st_size)) == NULL)\r
+    {\r
+      fprintf(stderr, "malloc: %s\n", strerror(errno)); \r
+      exit(1);\r
+    }\r
+\r
+    if ((read_length= read(fd, file_buffer_ptr, sbuf.st_size)) == -1)\r
+    {\r
+      fprintf(stderr, "read: %s\n", strerror(errno)); \r
+      exit(1);\r
+    }\r
+    assert(read_length == sbuf.st_size);\r
+\r
+    if (opt_method == OPT_ADD)\r
       rc= memcached_add(memc, ptr, strlen(ptr),\r
-                       mptr, sbuf.st_size,\r
+                        file_buffer_ptr, sbuf.st_size,\r
                        opt_expires, opt_flags);\r
-    else if (opt_replace == 2)\r
+    else if (opt_method == OPT_REPLACE)\r
       rc= memcached_replace(memc, ptr, strlen(ptr),\r
-                           mptr, sbuf.st_size,\r
+                           file_buffer_ptr, sbuf.st_size,\r
                            opt_expires, opt_flags);\r
     else\r
-      abort();\r
+      rc= memcached_set(memc, ptr, strlen(ptr),\r
+                        file_buffer_ptr, sbuf.st_size,\r
+                        opt_expires, opt_flags);\r
 \r
-    if (rc != MEMCACHED_SUCCESS) {\r
+    if (rc != MEMCACHED_SUCCESS)\r
       fprintf(stderr, "memcp: %s: memcache error %s\n", \r
              ptr, memcached_strerror(memc, rc));\r
-    }\r
 \r
-    munmap(mptr, sbuf.st_size);\r
+    WATCHPOINT;\r
+    free(file_buffer_ptr);\r
     close(fd);\r
     optind++;\r
   }\r
 \r
   memcached_deinit(memc);\r
 \r
+  cleanup();\r
+\r
   return 0;\r
 };\r
 \r
@@ -113,9 +123,9 @@ void options_parse(int argc, char *argv[])
       {"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
+      {"set",  no_argument, NULL, OPT_SET},\r
+      {"add",  no_argument, NULL, OPT_ADD},\r
+      {"replace",  no_argument, NULL, OPT_REPLACE},\r
       {0, 0, 0, 0},\r
     };\r
 \r
@@ -135,7 +145,7 @@ void options_parse(int argc, char *argv[])
       printf("useful help messages go here\n");\r
       exit(0);\r
     case OPT_SERVERS: /* --servers or -s */\r
-      opt_servers= optarg;\r
+      opt_servers= strdup_cleanup(optarg);\r
       break;\r
     case OPT_FLAG: /* --flag */\r
       opt_flags= (uint16_t)strtol(optarg, (char **)NULL, 10);\r
@@ -143,6 +153,15 @@ void options_parse(int argc, char *argv[])
     case OPT_EXPIRE: /* --expire */\r
       opt_expires= (time_t)strtol(optarg, (char **)NULL, 10);\r
       break;\r
+    case OPT_SET:\r
+      opt_method= OPT_SET;\r
+      break;\r
+    case OPT_REPLACE:\r
+      opt_method= OPT_REPLACE;\r
+      break;\r
+    case OPT_ADD:\r
+      opt_method= OPT_ADD;\r
+      break;\r
     case '?':\r
       /* getopt_long already printed an error message. */\r
       exit(1);\r