1 files changed, 57 insertions, 41 deletions

diff --git a/ot_iovec.c b/ot_iovec.c
index ec0bd12..8e94c52 100644
--- a/ot_iovec.c
+++ b/ot_iovec.c
@@ -4,73 +4,89 @@
    $id$ */
 
 /* System */
-#include <sys/types.h>
-#include <sys/mman.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <sys/types.h>
 #include <sys/uio.h>
+#include <unistd.h>
 
 /* Libowfat */
 
 /* Opentracker */
 #include "ot_iovec.h"
 
-void *iovec_increase( int *iovec_entries, struct iovec **iovector, size_t new_alloc ) {
-  void *new_ptr = realloc( *iovector, (1 + *iovec_entries ) * sizeof( struct iovec ) );
-  if( !new_ptr )
+void *iovec_increase(int *iovec_entries, struct iovec **iovector, size_t new_alloc) {
+  void         *new_data;
+  int           new_entries = 1 + *iovec_entries;
+  struct iovec *new_vec     = realloc(*iovector, new_entries * sizeof(struct iovec));
+
+  if (!new_vec)
     return NULL;
-  *iovector = new_ptr;
-  new_ptr = mmap( NULL, new_alloc, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0 );
-  if( !new_ptr )
+
+  /* Only allocate after we have a place to store the pointer */
+  new_data = malloc(new_alloc);
+  if (!new_data)
     return NULL;
-  ((*iovector)[*iovec_entries]).iov_base = new_ptr;
-  ((*iovector)[*iovec_entries]).iov_len  = new_alloc;
+
+  new_vec[new_entries - 1].iov_base = new_data;
+  new_vec[new_entries - 1].iov_len  = new_alloc;
+
+  *iovector                         = new_vec;
   ++*iovec_entries;
-  return new_ptr;
+  return new_data;
+}
+
+void *iovec_append(int *iovec_entries, struct iovec **iovector, struct iovec *append_iovector) {
+  int           new_entries = *iovec_entries + 1;
+  struct iovec *new_vec     = realloc(*iovector, new_entries * sizeof(struct iovec));
+  if (!new_vec)
+    return NULL;
+
+  /* Take over data from appended iovec */
+  new_vec[*iovec_entries].iov_base = append_iovector->iov_base;
+  new_vec[*iovec_entries].iov_len  = append_iovector->iov_len;
+
+  append_iovector->iov_base        = NULL;
+  append_iovector->iov_len         = 0;
+
+  *iovector                        = new_vec;
+  *iovec_entries                   = new_entries;
+
+  return new_vec;
 }
 
-void iovec_free( int *iovec_entries, struct iovec **iovector ) {
+void iovec_free(int *iovec_entries, struct iovec **iovector) {
   int i;
-  for( i=0; i<*iovec_entries; ++i )
-    munmap( ((*iovector)[i]).iov_base, ((*iovector)[i]).iov_len );
+  for (i = 0; i < *iovec_entries; ++i)
+    free(((*iovector)[i]).iov_base);
+  *iovector      = NULL;
   *iovec_entries = 0;
 }
 
-void  iovec_fixlast( int *iovec_entries, struct iovec **iovector, void *last_ptr ) {
-  int page_size = getpagesize();
-  size_t old_alloc, new_alloc, old_pages, new_pages;
-  char * base = (char*)((*iovector)[ *iovec_entries - 1 ]).iov_base;
+void iovec_fixlast(int *iovec_entries, struct iovec **iovector, void *last_ptr) {
+  if (*iovec_entries) {
+    char  *base      = (char *)((*iovector)[*iovec_entries - 1]).iov_base;
+    size_t new_alloc = ((char *)last_ptr) - base;
 
-  if( !*iovec_entries ) return;
-
-  old_alloc = ((*iovector)[ *iovec_entries - 1 ]).iov_len;
-  new_alloc = ((char*)last_ptr) - base;
-  old_pages = 1 + old_alloc / page_size;
-  new_pages = 1 + new_alloc / page_size;
-
-  if( old_pages != new_pages )
-    munmap( base + new_pages * page_size, old_alloc - new_pages * page_size );
-  ((*iovector)[*iovec_entries - 1 ]).iov_len = new_alloc;
+    ((*iovector)[*iovec_entries - 1]).iov_base = realloc(base, new_alloc);
+    ((*iovector)[*iovec_entries - 1]).iov_len  = new_alloc;
+  }
 }
 
-void  *iovec_fix_increase_or_free( int *iovec_entries, struct iovec **iovector, void *last_ptr, size_t new_alloc ) {
-  void *new_ptr;
+void *iovec_fix_increase_or_free(int *iovec_entries, struct iovec **iovector, void *last_ptr, size_t new_alloc) {
+  void *new_data;
 
-  iovec_fixlast( iovec_entries, iovector, last_ptr );
+  iovec_fixlast(iovec_entries, iovector, last_ptr);
 
-  if( !( new_ptr = iovec_increase( iovec_entries, iovector, new_alloc ) ) )
-    iovec_free( iovec_entries, iovector );
+  if (!(new_data = iovec_increase(iovec_entries, iovector, new_alloc)))
+    iovec_free(iovec_entries, iovector);
 
-  return new_ptr;
+  return new_data;
 }
 
-
-size_t iovec_length( int *iovec_entries, struct iovec **iovector ) {
+size_t iovec_length(const int *iovec_entries, const struct iovec **iovector) {
   size_t length = 0;
-  int i;
-  for( i=0; i<*iovec_entries; ++i )
+  int    i;
+  for (i = 0; i < *iovec_entries; ++i)
     length += ((*iovector)[i]).iov_len;
   return length;
 }
-
-const char *g_version_iovec_c = "$Source$: $Revision$\n";