Detect and report when open or opendir succeed but read and

[rsync/rsync.git] / fileio.c

diff --git a/fileio.c b/fileio.c
index 92631bc..088ed63 100644 (file)
--- a/fileio.c
+++ b/fileio.c
@@ -69,19 +69,22 @@ static int write_sparse(int f,char *buf,size_t len)
        return len;
 }
 
-
-
+/*
+ * 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 {
+                       r1 = write(f, buf, len);
+               }
                if (r1 <= 0) {
                        if (ret > 0) return ret;
                        return r1;
@@ -112,6 +115,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;
 }
@@ -188,7 +192,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 +211,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;
 }