Factor out common logic of unchanged_attrs and itemize into report_ATTR

[rsync/rsync.git] / fileio.c

diff --git a/fileio.c b/fileio.c
index d97cdac..d8ac097 100644 (file)
--- a/fileio.c
+++ b/fileio.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1998 Andrew Tridgell
  * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2004-2007 Wayne Davison
+ * Copyright (C) 2004-2009 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
  */
 
 #include "rsync.h"
+#include "inums.h"
 
 #ifndef ENODATA
 #define ENODATA EAGAIN
@@ -27,39 +28,43 @@
 
 extern int sparse_files;
 
-static char last_byte;
-static size_t sparse_seek = 0;
+static OFF_T sparse_seek = 0;
 
-int sparse_end(int f)
+int sparse_end(int f, OFF_T size)
 {
        int ret;
 
        if (!sparse_seek)
                return 0;
 
-       do_lseek(f, sparse_seek-1, SEEK_CUR);
-       sparse_seek = 0;
+#ifdef HAVE_FTRUNCATE
+       ret = do_ftruncate(f, size);
+#else
+       if (do_lseek(f, sparse_seek-1, SEEK_CUR) != size-1)
+               ret = -1;
+       else {
+               do {
+                       ret = write(f, "", 1);
+               } while (ret < 0 && errno == EINTR);
+
+               ret = ret <= 0 ? -1 : 0;
+       }
+#endif
 
-       do {
-               ret = write(f, "", 1);
-       } while (ret < 0 && errno == EINTR);
+       sparse_seek = 0;
 
-       return ret <= 0 ? -1 : 0;
+       return ret;
 }
 
 
-static int write_sparse(int f, char *buf, size_t len)
+static int write_sparse(int f, char *buf, int len)
 {
-       size_t l1 = 0, l2 = 0;
+       int l1 = 0, l2 = 0;
        int ret;
 
        for (l1 = 0; l1 < len && buf[l1] == 0; l1++) {}
        for (l2 = 0; l2 < len-l1 && buf[len-(l2+1)] == 0; l2++) {}
 
-       /* XXX Riddle me this: why does this function SLOW DOWN when I
-        * remove the following (unneeded) line?? Core Duo weirdness? */
-       last_byte = buf[len-1];
-
        sparse_seek += l1;
 
        if (l1 == len)
@@ -108,7 +113,7 @@ int flush_write_file(int f)
  * 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 write_file(int f, char *buf, int len)
 {
        int ret = 0;
 
@@ -125,7 +130,7 @@ int write_file(int f,char *buf,size_t len)
                                if (!wf_writeBuf)
                                        out_of_memory("write_file");
                        }
-                       r1 = MIN(len, wf_writeBufSize - wf_writeBufCnt);
+                       r1 = (int)MIN((size_t)len, wf_writeBufSize - wf_writeBufCnt);
                        if (r1) {
                                memcpy(wf_writeBuf + wf_writeBufCnt, buf, r1);
                                wf_writeBufCnt += r1;
@@ -159,13 +164,12 @@ struct map_struct *map_file(int fd, OFF_T len, int32 read_size,
 {
        struct map_struct *map;
 
-       if (!(map = new(struct map_struct)))
+       if (!(map = new0(struct map_struct)))
                out_of_memory("map_file");
 
        if (blk_size && (read_size % blk_size))
                read_size += blk_size - (read_size % blk_size);
 
-       memset(map, 0, sizeof map[0]);
        map->fd = fd;
        map->file_size = len;
        map->def_window_size = read_size;
@@ -233,8 +237,8 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
        if (map->p_fd_offset != read_start) {
                OFF_T ret = do_lseek(map->fd, read_start, SEEK_SET);
                if (ret != read_start) {
-                       rsyserr(FERROR, errno, "lseek returned %.0f, not %.0f",
-                               (double)ret, (double)read_start);
+                       rsyserr(FERROR, errno, "lseek returned %s, not %s",
+                               big_num(ret), big_num(read_start));
                        exit_cleanup(RERR_FILEIO);
                }
                map->p_fd_offset = read_start;