Kevin's patch bug13

[m6w6/libmemcached] / lib / memcached_io.c

diff --git a/lib/memcached_io.c b/lib/memcached_io.c
index 1ef7a4654db24a4152d086588b0cbeb032bdd10a..22c54e420da76f51f888a3c4eef6b0480e3c892c 100644 (file)
--- a/lib/memcached_io.c
+++ b/lib/memcached_io.c
@@ -93,8 +93,11 @@ ssize_t memcached_io_read(memcached_server_st *ptr,
         data_read= read(ptr->fd, 
                         ptr->read_buffer, 
                         MEMCACHED_MAX_BUFFER);
-        if (data_read == -1)
+        if (data_read)
+          break;
+        else if (data_read == -1)
         {
+          ptr->cached_errno= errno;
           switch (errno)
           {
           case EAGAIN:
@@ -105,21 +108,15 @@ ssize_t memcached_io_read(memcached_server_st *ptr,
 
               if (rc == MEMCACHED_SUCCESS)
                 continue;
-
-              memcached_quit_server(ptr, 1);
-              return -1;
             }
+          /* fall trough */
           default:
             {
               memcached_quit_server(ptr, 1);
-              ptr->cached_errno= errno;
               return -1;
             }
           }
         }
-        else if (data_read)
-          break;
-        /* If zero, just keep looping unless testing, then assert() */
         else
         {
           WATCHPOINT_ASSERT(0);
@@ -148,10 +145,10 @@ ssize_t memcached_io_read(memcached_server_st *ptr,
     else
     {
       *buffer_ptr= *ptr->read_ptr;
-      length--;
       ptr->read_ptr++;
       ptr->read_buffer_length--;
       buffer_ptr++;
+      break;
     }
 
     if (found_eof)
@@ -164,13 +161,26 @@ ssize_t memcached_io_read(memcached_server_st *ptr,
 ssize_t memcached_io_write(memcached_server_st *ptr,
                            char *buffer, size_t length, char with_flush)
 {
-  unsigned long long x;
+  size_t original_length;
+  char* buffer_ptr;
 
-  for (x= 0; x < length; x++)
+  original_length= length;
+  buffer_ptr= buffer;
+
+  while (length)
   {
-    ptr->write_buffer[ptr->write_buffer_offset]= buffer[x];
-    ptr->write_buffer_offset++;
-    WATCHPOINT_ASSERT(ptr->write_buffer_offset <= MEMCACHED_MAX_BUFFER);
+    char *write_ptr;
+    size_t should_write;
+
+    should_write= MEMCACHED_MAX_BUFFER - ptr->write_buffer_offset;
+    write_ptr= ptr->write_buffer + ptr->write_buffer_offset;
+
+    should_write= (should_write < length) ? should_write : length;
+
+    memcpy(write_ptr, buffer_ptr, should_write);
+    ptr->write_buffer_offset+= should_write;
+    buffer_ptr+= should_write;
+    length-= should_write;
 
     if (ptr->write_buffer_offset == MEMCACHED_MAX_BUFFER)
     {
@@ -192,7 +202,7 @@ ssize_t memcached_io_write(memcached_server_st *ptr,
       return -1;
   }
 
-  return length;
+  return original_length;
 }
 
 memcached_return memcached_io_close(memcached_server_st *ptr)
@@ -234,7 +244,6 @@ static ssize_t io_flush(memcached_server_st *ptr,
       if ((ssize_t)(sent_length= write(ptr->fd, local_write_ptr, 
                                        write_length)) == -1)
       {
-        WATCHPOINT_STRING("Error in write occurred");
         switch (errno)
         {
         case ENOBUFS: