Mention that --whole-file interferes with the reuse of a --partial-dir

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index c1b46a6..b999ac8 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -42,6 +42,7 @@ extern int size_only;
 extern int io_timeout;
 extern int protocol_version;
 extern int always_checksum;
+extern char *partial_dir;
 extern char *compare_dest;
 extern int link_dest;
 extern int whole_file;
@@ -78,15 +79,6 @@ static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
           of the file time to determine whether to sync */
        if (always_checksum && S_ISREG(st->st_mode)) {
                char sum[MD4_SUM_LENGTH];
-               char fnamecmpdest[MAXPATHLEN];
-
-               if (compare_dest != NULL) {
-                       if (access(fname, 0) != 0) {
-                               pathjoin(fnamecmpdest, sizeof fnamecmpdest,
-                                        compare_dest, fname);
-                               fname = fnamecmpdest;
-                       }
-               }
                file_checksum(fname,sum,st->st_size);
                return memcmp(sum, file->u.sum, protocol_version < 21 ? 2
                                                        : MD4_SUM_LENGTH) == 0;
@@ -162,7 +154,6 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
                        c >>= 1;
                } while (c >= 8);       /* round to multiple of 8 */
                blength = MAX(blength, BLOCK_SIZE);
-               blength = MIN(blength, MAX_MAP_SIZE);
        }
 
        if (protocol_version < 27) {
@@ -217,7 +208,7 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out)
        sum_sizes_sqroot(&sum, len);
 
        if (len > 0)
-               mapbuf = map_file(fd, len, sum.blength);
+               mapbuf = map_file(fd, len, MAX_MAP_SIZE, sum.blength);
        else
                mapbuf = NULL;
 
@@ -282,10 +273,16 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
                return;
        }
 
-       statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode));
-       stat_errno = errno;
+       if (dry_run > 1) {
+               statret = -1;
+               stat_errno = ENOENT;
+       } else {
+               statret = link_stat(fname, &st,
+                                   keep_dirlinks && S_ISDIR(file->mode));
+               stat_errno = errno;
+       }
 
-       if (only_existing && statret == -1 && errno == ENOENT) {
+       if (only_existing && statret == -1 && stat_errno == ENOENT) {
                /* we only want to update existing files */
                if (verbose > 1) {
                        rprintf(FINFO, "not creating new file \"%s\"\n",
@@ -479,7 +476,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
                return;
        }
 
-       if (skip_file(fname, file, &st)) {
+       if (skip_file(fnamecmp, file, &st)) {
                if (fnamecmp == fname)
                        set_perms(fname, file, &st, PERMS_REPORT);
                return;
@@ -496,6 +493,16 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
                return;
        }
 
+       if (partial_dir) {
+               STRUCT_STAT st2;
+               char *partialptr = partial_dir_fname(fname);
+               if (partialptr && link_stat(partialptr, &st2, 0) == 0
+                   && S_ISREG(st2.st_mode)) {
+                       st = st2;
+                       fnamecmp = partialptr;
+               }
+       }
+
        /* open the file */
        fd = do_open(fnamecmp, O_RDONLY, 0);