Applied a slightly-tweaked version of Oliver Braun's patch that

[rsync/rsync.git] / fileio.c

diff --git a/fileio.c b/fileio.c
index 92631bc..bc24428 100644 (file)
--- a/fileio.c
+++ b/fileio.c
@@ -70,18 +70,51 @@ static int write_sparse(int f,char *buf,size_t len)
 }
 
 
+static char *wf_writeBuf;
+static size_t wf_writeBufSize;
+static size_t wf_writeBufCnt;
 
+int flush_write_file(int f)
+{
+       int ret = write(f, wf_writeBuf, wf_writeBufCnt);
+       if (ret < 0)
+               return ret;
+       /* if (ret < wf_writeBufCnt) ??? */
+       wf_writeBufCnt = 0;
+       return ret;
+}
+
+/*
+ * write_file does not allow incomplete writes.  It loops internally
+ * until len bytes are written or errno is set.
+ */
 int write_file(int f,char *buf,size_t len)
 {
        int ret = 0;
 
-       if (!sparse_files) {
-               return write(f,buf,len);
-       }
-
        while (len>0) {
-               int len1 = MIN(len, SPARSE_WRITE_SIZE);
-               int r1 = write_sparse(f, buf, len1);
+               int r1;
+               if (sparse_files) {
+                       int len1 = MIN(len, SPARSE_WRITE_SIZE);
+                       r1 = write_sparse(f, buf, len1);
+               } else {
+                       if (!wf_writeBuf) {
+                               wf_writeBufSize = MAX_MAP_SIZE;
+                               wf_writeBufCnt  = 0;
+                               wf_writeBuf = new_array(char, MAX_MAP_SIZE);
+                               if (!wf_writeBuf) out_of_memory("write_file");
+                       }
+                       r1 = MIN(len, wf_writeBufSize - wf_writeBufCnt);
+                       if (r1) {
+                               memcpy(wf_writeBuf + wf_writeBufCnt, buf, r1);
+                               wf_writeBufCnt += r1;
+                       }
+                       if (wf_writeBufCnt == wf_writeBufSize) {
+                               if (flush_write_file(f) < 0) return -1;
+                               if (!r1 && len)
+                                       continue;
+                       }
+               }
                if (r1 <= 0) {
                        if (ret > 0) return ret;
                        return r1;
@@ -102,7 +135,7 @@ int write_file(int f,char *buf,size_t len)
 struct map_struct *map_file(int fd,OFF_T len)
 {
        struct map_struct *map;
-       map = (struct map_struct *)malloc(sizeof(*map));
+       map = new(struct map_struct);
        if (!map) out_of_memory("map_file");
 
        map->fd = fd;
@@ -112,6 +145,7 @@ struct map_struct *map_file(int fd,OFF_T len)
        map->p_offset = 0;
        map->p_fd_offset = 0;
        map->p_len = 0;
+       map->status = 0;
 
        return map;
 }
@@ -156,7 +190,7 @@ char *map_ptr(struct map_struct *map,OFF_T offset,int len)
 
        /* make sure we have allocated enough memory for the window */
        if (window_size > map->p_size) {
-               map->p = (char *)Realloc(map->p, window_size);
+               map->p = realloc_array(map->p, char, window_size);
                if (!map->p) out_of_memory("map_ptr");
                map->p_size = window_size;
        }
@@ -188,7 +222,11 @@ char *map_ptr(struct map_struct *map,OFF_T offset,int len)
                }
 
                if ((nread=read(map->fd,map->p + read_offset,read_size)) != read_size) {
-                       if (nread < 0) nread = 0;
+                       if (nread < 0) {
+                               nread = 0;
+                               if (!map->status)
+                                       map->status = errno;
+                       }
                        /* the best we can do is zero the buffer - the file
                           has changed mid transfer! */
                        memset(map->p+read_offset+nread, 0, read_size - nread);
@@ -203,13 +241,18 @@ char *map_ptr(struct map_struct *map,OFF_T offset,int len)
 }
 
 
-void unmap_file(struct map_struct *map)
+int unmap_file(struct map_struct *map)
 {
+       int     ret;
+
        if (map->p) {
                free(map->p);
                map->p = NULL;
        }
+       ret = map->status;
        memset(map, 0, sizeof(*map));
        free(map);
+
+       return ret;
 }