X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a255c592e8fa9e4570ebbf333e95a402f9e84a03..82471e68a8bb3da8ca95f2b6564c330c52ce891e:/generator.c diff --git a/generator.c b/generator.c index c3ba30ce..8c786e73 100644 --- a/generator.c +++ b/generator.c @@ -47,7 +47,7 @@ extern int protocol_version; extern int always_checksum; extern char *partial_dir; extern char *basis_dir[]; -extern int copy_dest; +extern int compare_dest; extern int link_dest; extern int whole_file; extern int local_server; @@ -100,23 +100,6 @@ static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) } -/* - * NULL sum_struct means we have no checksums - */ -void write_sum_head(int f, struct sum_struct *sum) -{ - static struct sum_struct null_sum; - - if (sum == NULL) - sum = &null_sum; - - write_int(f, sum->count); - write_int(f, sum->blength); - if (protocol_version >= 27) - write_int(f, sum->s2length); - write_int(f, sum->remainder); -} - /* * set (initialize) the size entries in the per-file sum_struct * calculating dynamic block and checksum sizes. @@ -134,7 +117,7 @@ void write_sum_head(int f, struct sum_struct *sum) * * This might be made one of several selectable heuristics. */ -static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) +static void sum_sizes_sqroot(struct sum_struct *sum, int64 len) { int32 blength; int s2length; @@ -145,18 +128,21 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) blength = BLOCK_SIZE; else { int32 c; - uint64 l; - for (c = 1, l = len; l >>= 2; c <<= 1) { - assert(c > 0); + int64 l; + int cnt; + for (c = 1, l = len, cnt = 0; l >>= 2; c <<= 1, cnt++) {} + if (cnt >= 31 || c >= MAX_BLOCK_SIZE) + blength = MAX_BLOCK_SIZE; + else { + blength = 0; + do { + blength |= c; + if (len < (int64)blength * blength) + blength &= ~c; + c >>= 1; + } while (c >= 8); /* round to multiple of 8 */ + blength = MAX(blength, BLOCK_SIZE); } - blength = 0; - do { - blength |= c; - if (len < (uint64)blength * blength) - blength &= ~c; - c >>= 1; - } while (c >= 8); /* round to multiple of 8 */ - blength = MAX(blength, BLOCK_SIZE); } if (protocol_version < 27) { @@ -165,7 +151,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) s2length = SUM_LENGTH; } else { int32 c; - uint64 l; + int64 l; int b = BLOCKSUM_BIAS; for (l = len; l >>= 1; b += 2) {} for (c = blength; c >>= 1 && b; b--) {} @@ -239,7 +225,6 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy) } - /* * Acts on file number @p i from @p flist, whose name is @p fname. * @@ -307,23 +292,15 @@ static void recv_generator(char *fname, struct file_struct *file, int i, * to prepare appropriately. If there is already a * file of that name and it is *not* a directory, then * we need to delete it. If it doesn't exist, then - * recursively create it. */ - - if (dry_run) - return; /* TODO: causes inaccuracies -- fix */ + * (perhaps recursively) create it. */ if (statret == 0 && !S_ISDIR(st.st_mode)) { - if (robust_unlink(fname) != 0) { - rsyserr(FERROR, errno, - "recv_generator: unlink %s to make room for directory", - full_fname(fname)); - return; - } + delete_file(fname, DEL_TERSE); statret = -1; } if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) { - if (!(relative_paths && errno == ENOENT - && create_directory_path(fname, orig_umask) == 0 - && do_mkdir(fname, file->mode) == 0)) { + if (!relative_paths || errno != ENOENT + || create_directory_path(fname, orig_umask) < 0 + || do_mkdir(fname, file->mode) < 0) { rsyserr(FERROR, errno, "recv_generator: mkdir %s failed", full_fname(fname)); @@ -343,9 +320,6 @@ static void recv_generator(char *fname, struct file_struct *file, int i, if (preserve_links && S_ISLNK(file->mode)) { #if SUPPORT_LINKS - char lnk[MAXPATHLEN]; - int l; - if (safe_symlinks && unsafe_symlink(file->u.link, fname)) { if (verbose) { rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n", @@ -354,22 +328,25 @@ static void recv_generator(char *fname, struct file_struct *file, int i, return; } if (statret == 0) { - l = readlink(fname,lnk,MAXPATHLEN-1); - if (l > 0) { - lnk[l] = 0; + int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0; + char lnk[MAXPATHLEN]; + int len; + + if (!dflag + && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) { + lnk[len] = 0; /* A link already pointing to the * right place -- no further action * required. */ - if (strcmp(lnk,file->u.link) == 0) { + if (strcmp(lnk, file->u.link) == 0) { set_perms(fname, file, &st, PERMS_REPORT); return; } } - /* Not a symlink, so delete whatever's - * already there and put a new symlink - * in place. */ - delete_file(fname); + /* Not the right symlink (or not a symlink), so + * delete it. */ + delete_file(fname, dflag | DEL_TERSE); } if (do_symlink(file->u.link,fname) != 0) { rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed", @@ -389,7 +366,8 @@ static void recv_generator(char *fname, struct file_struct *file, int i, if (statret != 0 || st.st_mode != file->mode || st.st_rdev != file->u.rdev) { - delete_file(fname); + int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0; + delete_file(fname, dflag | DEL_TERSE); if (verbose > 2) { rprintf(FINFO,"mknod(%s,0%o,0x%x)\n", safe_fname(fname), @@ -467,25 +445,26 @@ static void recv_generator(char *fname, struct file_struct *file, int i, safe_fname(fname)); } fnamecmp = fnamecmpbuf; - fnamecmp_type = FNAMECMP_BASIS_DIR + i; + fnamecmp_type = i; } } else #endif { fnamecmp = fnamecmpbuf; - fnamecmp_type = FNAMECMP_BASIS_DIR + i; + fnamecmp_type = i; } } } if (statret == 0 && !S_ISREG(st.st_mode)) { - if (delete_file(fname) != 0) + int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0; + if (delete_file(fname, dflag | DEL_TERSE) != 0) return; statret = -1; stat_errno = ENOENT; } - if (partial_dir && (partialptr = partial_dir_fname(fname)) + if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL && link_stat(partialptr, &partial_st, 0) == 0 && S_ISREG(partial_st.st_mode)) { if (statret == -1) @@ -519,7 +498,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i, return; } - if ((link_dest || copy_dest) && fnamecmp_type != FNAMECMP_FNAME) + if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) ; else if (unchanged_file(fnamecmp, file, &st)) { if (fnamecmp_type == FNAMECMP_FNAME) @@ -528,6 +507,13 @@ static void recv_generator(char *fname, struct file_struct *file, int i, } prepare_to_open: + if (partialptr) { + st = partial_st; + fnamecmp = partialptr; + fnamecmp_type = FNAMECMP_PARTIAL_DIR; + statret = 0; + } + if (dry_run || whole_file > 0) { statret = -1; goto notify_others; @@ -535,12 +521,6 @@ prepare_to_open: if (read_batch) goto notify_others; - if (partialptr) { - st = partial_st; - fnamecmp = partialptr; - fnamecmp_type = FNAMECMP_PARTIAL_DIR; - } - /* open the file */ fd = do_open(fnamecmp, O_RDONLY, 0); @@ -592,6 +572,8 @@ prepare_to_open: notify_others: write_int(f_out, i); + if (protocol_version >= 29 && inplace && !read_batch) + write_byte(f_out, fnamecmp_type); if (f_out_name >= 0) write_byte(f_out_name, fnamecmp_type); @@ -685,6 +667,9 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, write_int(f_out, -1); + /* Read post-redo-phase MSG_DONE and any prior messages. */ + get_redo_num(); + if (preserve_hard_links) do_hard_links();