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

Cleanup method for string
Moved from send to write.
More enum (raw numbers bad!)

diff --git a/lib/memcached_auto.c b/lib/memcached_auto.c
index 268f95b8b5b6474c4a5505f56c62233fe7b88a45..975be824ac5c4afcefdfd313d6c6eabbb99fa459 100644 (file)
--- a/lib/memcached_auto.c
+++ b/lib/memcached_auto.c
@@ -23,7 +23,7 @@ static memcached_return memcached_auto(memcached_st *ptr,
                         key_length, key,
                         offset);
 
-  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
+  if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
   {
     fprintf(stderr, "failed set on %.*s TCP\n", key_length+1, key);
 

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 592ede44e804e4dad5b0511f37927b0d1c3d746a..d015c68a2ccf7b42c1d5f05411733afa99d6f001 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -10,7 +10,6 @@ memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigne
 
 
   ptr->hosts= (memcached_host_st *)realloc(ptr->hosts, sizeof(memcached_host_st) * (ptr->number_of_hosts+1));
-  memset(ptr->hosts, 0, sizeof(memcached_host_st) * (size_t)ptr->number_of_hosts);
   ptr->hosts[ptr->number_of_hosts].hostname=
     (char *)malloc(sizeof(char) * (strlen(hostname)+1));
   memset(ptr->hosts[ptr->number_of_hosts].hostname, 0, strlen(hostname)+1);

diff --git a/lib/memcached_flush.c b/lib/memcached_flush.c
index f7527a7c31eb42ebfc3070ea0118ab3a70e2f745..a3e1be0b191250810f906b83411a1b77c8ebb941 100644 (file)
--- a/lib/memcached_flush.c
+++ b/lib/memcached_flush.c
@@ -20,7 +20,7 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
     else
       send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                             "flush_all\r\n");
-    if ((send(ptr->hosts[x].fd, buffer, send_length, 0) == -1))
+    if ((write(ptr->hosts[x].fd, buffer, send_length) == -1))
     {
       fprintf(stderr, "failed flush_all TCP\n");
 

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index c688af34639684f8931d54c00e5db1b4a9c19946..36d965052f750c4fd16d1a55702340ecdb7ed932 100644 (file)
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -23,7 +23,7 @@ char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
   if (*error != MEMCACHED_SUCCESS)
     return NULL;
 
-  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
+  if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
   {
     fprintf(stderr, "failed fetch on %.*s TCP\n", key_length+1, key);
     *error= MEMCACHED_WRITE_FAILURE;

diff --git a/lib/memcached_stats.c b/lib/memcached_stats.c
index 2511532c26f7db2754cf1081ebc221980acb0517..8928ee0909ec06bbba9ab23be4486d86fb2d948b 100644 (file)
--- a/lib/memcached_stats.c
+++ b/lib/memcached_stats.c
@@ -136,7 +136,7 @@ static memcached_return memcached_stats_fetch(memcached_st *ptr,
     send_length= snprintf(buffer, HUGE_STRING_LEN, 
                           "stats\r\n");
 
-  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
+  if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
   {
     fprintf(stderr, "failed on stats\n");
 

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index 3df4913ad10fb23cb06d9b61a9c0ef4246bd3ec6..5c34a57347dfd6854e418263cd7464d2954d8775 100644 (file)
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -16,43 +16,55 @@ static memcached_return memcached_send(memcached_st *ptr,
                                        uint16_t  flags,
                                        char *verb)
 {
-  size_t send_length;
+  size_t write_length;
+  ssize_t sent_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
 
   rc= memcached_connect(ptr);
+  assert(value);
+  assert(value_length);
 
   if (rc != MEMCACHED_SUCCESS)
     return rc;
 
   server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
 
-  send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
+  write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                         "%s %.*s %u %u %u\r\n", verb,
                         key_length, key, flags, expiration, value_length);
-  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
+  if ((sent_length= write(ptr->hosts[server_key].fd, buffer, write_length)) == -1)
   {
-    fprintf(stderr, "failed set on %.*s TCP\n", key_length+1, key);
+    fprintf(stderr, "failed %s on %.*s: %s\n", verb, key_length+1, key, strerror(errno));
 
     return MEMCACHED_WRITE_FAILURE;
   }
+  assert(write_length == sent_length);
 
-  send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                        "%.*s\r\n", 
-                        value_length, value);
-  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
+  WATCHPOINT;
+  printf("About to push %.*s\n", value_length, value);
+  WATCHPOINT;
+  if ((sent_length= write(ptr->hosts[server_key].fd, value, value_length)) == -1)
   {
-    fprintf(stderr, "failed set on %.*s TCP\n", key_length+1, key);
+    fprintf(stderr, "failed %s on %.*s: %s\n", verb, key_length+1, key, strerror(errno));
 
     return MEMCACHED_WRITE_FAILURE;
   }
-  
-  send_length= read(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE);
+  assert(value_length == sent_length);
+  if ((sent_length= write(ptr->hosts[server_key].fd, "\r\n", 2)) == -1)
+  {
+    fprintf(stderr, "failed %s on %.*s: %s\n", verb, key_length+1, key, strerror(errno));
+
+    return MEMCACHED_WRITE_FAILURE;
+  }
+  assert(2 == sent_length);
+
+  sent_length= read(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE);
 
-  if (send_length && buffer[0] == 'S')  /* STORED */
+  if (sent_length && buffer[0] == 'S')  /* STORED */
     return MEMCACHED_SUCCESS;
-  else if (send_length && buffer[0] == 'N')  /* NOT_STORED */
+  else if (write_length && buffer[0] == 'N')  /* NOT_STORED */
     return MEMCACHED_NOTSTORED;
   else
     return MEMCACHED_READ_FAILURE;

diff --git a/lib/memcached_verbosity.c b/lib/memcached_verbosity.c
index 4e586cfb7b7b219410b9ee7d35929f5ba300213a..bb4f68c06ecd13c2fd1ada0681a0b743fdb1a0c7 100644 (file)
--- a/lib/memcached_verbosity.c
+++ b/lib/memcached_verbosity.c
@@ -19,7 +19,7 @@ memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity)
   {
     memcached_return rc;
 
-    if ((send(ptr->hosts[x].fd, buffer, send_length, 0) == -1))
+    if ((write(ptr->hosts[x].fd, buffer, send_length) == -1))
     {
       fprintf(stderr, "failed verbosity\n");
 

diff --git a/src/memcat.c b/src/memcat.c
index 1a6e38988b17f864d0f68aa434c35dc6972abba8..4253aa00fc2663e0a4ab6804f9eb7f9d100f93c7 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -26,7 +26,8 @@ int main(int argc, char *argv[])
 \r
   options_parse(argc, argv);\r
 \r
-  parse_opt_servers(memc, opt_servers);\r
+  if (opt_servers)\r
+    parse_opt_servers(memc, opt_servers);\r
 \r
   while (optind <= argc) \r
   {\r
@@ -37,13 +38,13 @@ int main(int argc, char *argv[])
       if (opt_displayflag)\r
       {\r
        if (opt_verbose)\r
-         printf("key: %.*s\nflags: ", argv[optind]);\r
-       printf("%d\n", flags);\r
+         printf("key: %s\nflags: ", argv[optind]);\r
+       printf("%u\n", flags);\r
       }\r
       else \r
       {\r
        if (opt_verbose)\r
-         printf("key: %.*s\nflags: %d\nlength: %d\nvalue: ",\r
+         printf("key: %s\nflags: %u\nlength: %uz\nvalue: ",\r
                 argv[optind], flags, string_length);\r
         printf("%.*s\n", string_length, string);\r
         free(string);\r
@@ -72,8 +73,8 @@ void options_parse(int argc, char *argv[])
     {\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", no_argument, &opt_displayflag, OPT_FLAG},\r
       {0, 0, 0, 0},\r

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

diff --git a/src/memrm.c b/src/memrm.c
index 49172e5a08c4f2542240bd0c0c1bd0c82b00c0e5..4a3da0218b5032f4f1aaab4580d5cf6f2401dfbb 100644 (file)
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -19,8 +19,8 @@ int main(int argc, char *argv[])
     {\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
       {"expire", required_argument, NULL, OPT_EXPIRE},\r
       {0, 0, 0, 0},\r
@@ -62,12 +62,12 @@ int main(int argc, char *argv[])
   \r
   while (optind <= argc) \r
   {\r
-    if (opt_verbose) {\r
-      printf("key: %s\nexpires: %ld\n", argv[optind], expires);\r
-    }\r
+    if (opt_verbose) \r
+      printf("key: %s\nexpires: %llu\n", argv[optind], expires);\r
     rc = memcached_delete(memc, argv[optind], strlen(argv[optind]), expires);\r
 \r
-    if (rc != MEMCACHED_SUCCESS) {\r
+    if (rc != MEMCACHED_SUCCESS) \r
+    {\r
       fprintf(stderr, "memrm: %s: memcache error %s\n", \r
              argv[optind], memcached_strerror(memc, rc));\r
     }\r

diff --git a/src/utilities.c b/src/utilities.c
index 5dd66f62731d871651d16eb7a5232bc39797a006..ce6cd925bdc76d566ca15d4a5243d71102e32a47 100644 (file)
--- a/src/utilities.c
+++ b/src/utilities.c
@@ -1,14 +1,23 @@
 #include <memcached.h>
 
+static char **cleanup_list= NULL;
+static char cleanup_list_length= 0;
+
 void parse_opt_servers(memcached_st *memc,
-                       char *opt_servers)
+                       char *server_strings)
 {
   char *string;
   unsigned int port;
   char *begin_ptr;
+  char *end_ptr;
+
+  end_ptr= server_strings + strlen(server_strings);
+
+  assert(server_strings);
+  assert(memc);
 
-  for (begin_ptr= opt_servers, string= index(opt_servers, ','); 
-       begin_ptr[0]; 
+  for (begin_ptr= server_strings, string= index(server_strings, ','); 
+       begin_ptr == end_ptr; 
        begin_ptr= ++string, string= index(begin_ptr, ','))
   {
     char buffer[HUGE_STRING_LEN];
@@ -21,9 +30,9 @@ void parse_opt_servers(memcached_st *memc,
     }
     else
     {
-      size_t length= strlen(opt_servers);
+      size_t length= strlen(server_strings);
       memcpy(buffer, begin_ptr, length);
-      string= opt_servers+length;
+      string= server_strings+length;
     }
 
     ptr= index(buffer, ':');
@@ -45,3 +54,24 @@ void parse_opt_servers(memcached_st *memc,
   }
 }
 
+void cleanup(void)
+{
+  unsigned int x;
+  for (x= 0; x < cleanup_list_length; x++)
+    free(cleanup_list[x]);
+
+  free(cleanup_list);
+}
+
+char *strdup_cleanup(const char *str)
+{
+  char *ptr;
+
+  ptr= strdup(str);
+
+  cleanup_list= (char **)realloc(cleanup_list, sizeof(char *) * (cleanup_list_length+1));
+  cleanup_list[cleanup_list_length]= ptr;
+  cleanup_list_length++;
+
+  return ptr;
+}

diff --git a/src/utilities.h b/src/utilities.h
index fe79781797816ddd7d85314d5c7eb96af982c366..7d442f23661c0a9627224c9735951f7db68c2335 100644 (file)
--- a/src/utilities.h
+++ b/src/utilities.h
@@ -2,3 +2,5 @@
 
 void parse_opt_servers (memcached_st *ptr,
                         char *opt_servers);
+char *strdup_cleanup(const char *str);
+void cleanup(void);