X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/72c19bb3de47c40fcd8d950805ed22689064db7c..e66d70e34cd84c49e36c78920e33da5db72f82a8:/generator.c diff --git a/generator.c b/generator.c index 6d1f3491..188f51f1 100644 --- a/generator.c +++ b/generator.c @@ -34,16 +34,24 @@ extern int preserve_hard_links; extern int preserve_perms; extern int preserve_uid; extern int preserve_gid; +extern int preserve_times; +extern int omit_dir_times; +extern int delete_during; extern int update_only; extern int opt_ignore_existing; +extern int inplace; +extern int make_backups; extern int csum_length; extern int ignore_times; extern int size_only; +extern OFF_T max_size; extern int io_timeout; extern int protocol_version; +extern int fuzzy_basis; extern int always_checksum; extern char *partial_dir; -extern char *compare_dest; +extern char *basis_dir[]; +extern int compare_dest; extern int link_dest; extern int whole_file; extern int local_server; @@ -52,34 +60,75 @@ extern int read_batch; extern int only_existing; extern int orig_umask; extern int safe_symlinks; -extern unsigned int block_size; +extern long block_size; /* "long" because popt can't set an int32. */ -extern struct exclude_list_struct server_exclude_list; +extern struct filter_list_struct server_filter_list; - -/* choose whether to skip a particular file */ -static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st) +static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) { - if (st->st_size != file->length) + if (preserve_perms + && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) return 0; - if (link_dest) { - if (preserve_perms - && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) - return 0; - if (am_root && preserve_uid && st->st_uid != file->uid) - return 0; + if (am_root && preserve_uid && st->st_uid != file->uid) + return 0; + + if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid) + return 0; + + return 1; +} + + +#define SID_UPDATING ITEM_UPDATING +#define SID_REPORT_CHECKSUM ITEM_REPORT_CHECKSUM +#define SID_NO_DEST_AND_NO_UPDATE (1<<16) - if (preserve_gid && file->gid != GID_NONE - && st->st_gid != file->gid) - return 0; +static void itemize(struct file_struct *file, int statret, STRUCT_STAT *st, + int32 sflags, int f_out, int ndx) +{ + int iflags = sflags & (SID_UPDATING | SID_REPORT_CHECKSUM); + + if (statret >= 0) { + if (S_ISREG(file->mode) && file->length != st->st_size) + iflags |= ITEM_REPORT_SIZE; + } else + iflags |= ITEM_IS_NEW; + if (statret >= 0 && !(sflags & SID_NO_DEST_AND_NO_UPDATE)) { + int keep_time = !preserve_times ? 0 + : S_ISDIR(file->mode) ? !omit_dir_times : !S_ISLNK(file->mode); + + if ((iflags & ITEM_UPDATING && !keep_time) + || (keep_time && file->modtime != st->st_mtime)) + iflags |= ITEM_REPORT_TIME; + if (preserve_perms && file->mode != st->st_mode) + iflags |= ITEM_REPORT_PERMS; + if (preserve_uid && am_root && file->uid != st->st_uid) + iflags |= ITEM_REPORT_OWNER; + if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid) + iflags |= ITEM_REPORT_GROUP; + } + + if (iflags && !read_batch) { + if (ndx >= 0) + write_int(f_out, ndx); + write_byte(f_out, iflags); + write_byte(f_out, iflags >> 8); } +} + + +/* Perform our quick-check heuristic for determining if a file is unchanged. */ +static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) +{ + if (st->st_size != file->length) + return 0; /* if always checksum is set then we use the checksum instead of the file time to determine whether to sync */ if (always_checksum && S_ISREG(st->st_mode)) { char sum[MD4_SUM_LENGTH]; - file_checksum(fname,sum,st->st_size); + file_checksum(fn, sum, st->st_size); return memcmp(sum, file->u.sum, protocol_version < 21 ? 2 : MD4_SUM_LENGTH) == 0; } @@ -94,23 +143,6 @@ static int skip_file(char *fname, 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. @@ -128,32 +160,32 @@ 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) { - unsigned int blength; + int32 blength; int s2length; - uint32 c; - uint64 l; - if (block_size) { + if (block_size) blength = block_size; - } else if (len <= BLOCK_SIZE * BLOCK_SIZE) { + else if (len <= BLOCK_SIZE * BLOCK_SIZE) blength = BLOCK_SIZE; - } else { - l = len; - c = 1; - while (l >>= 2) { - c <<= 1; + else { + int32 c; + 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) { @@ -161,20 +193,13 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) } else if (csum_length == SUM_LENGTH) { s2length = SUM_LENGTH; } else { + int32 c; + int64 l; int b = BLOCKSUM_BIAS; - l = len; - while (l >>= 1) { - b += 2; - } - c = blength; - while (c >>= 1 && b) { - b--; - } - s2length = (b + 1 - 32 + 7) / 8; /* add a bit, - * subtract rollsum, - * round up - * --optimize in compiler-- - */ + for (l = len; l >>= 1; b += 2) {} + for (c = blength; c >>= 1 && b; b--) {} + /* add a bit, subtract rollsum, round up. */ + s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */ s2length = MAX(s2length, csum_length); s2length = MIN(s2length, SUM_LENGTH); } @@ -186,8 +211,9 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) sum->remainder = (len % blength); if (sum->count && verbose > 2) { - rprintf(FINFO, "count=%.0f rem=%u blength=%u s2length=%d flength=%.0f\n", - (double)sum->count, sum->remainder, sum->blength, + rprintf(FINFO, + "count=%.0f rem=%ld blength=%ld s2length=%d flength=%.0f\n", + (double)sum->count, (long)sum->remainder, (long)sum->blength, sum->s2length, (double)sum->flength); } } @@ -198,9 +224,9 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) * * Generate approximately one checksum every block_len bytes. */ -static void generate_and_send_sums(int fd, OFF_T len, int f_out) +static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy) { - size_t i; + int32 i; struct map_struct *mapbuf; struct sum_struct sum; OFF_T offset = 0; @@ -215,17 +241,20 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out) write_sum_head(f_out, &sum); for (i = 0; i < sum.count; i++) { - unsigned int n1 = MIN(len, sum.blength); + int32 n1 = (int32)MIN(len, (OFF_T)sum.blength); char *map = map_ptr(mapbuf, offset, n1); uint32 sum1 = get_checksum1(map, n1); char sum2[SUM_LENGTH]; + if (f_copy >= 0) + full_write(f_copy, map, n1); + get_checksum2(map, n1, sum2); if (verbose > 3) { rprintf(FINFO, - "chunk[%.0f] offset=%.0f len=%u sum1=%08lx\n", - (double)i, (double)offset, n1, + "chunk[%.0f] offset=%.0f len=%ld sum1=%08lx\n", + (double)i, (double)offset, (long)n1, (unsigned long)sum1); } write_int(f_out, sum1); @@ -239,33 +268,108 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out) } +/* Try to find a filename in the same dir as "fname" with a similar name. */ +static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) +{ + int fname_len, fname_suf_len; + const char *fname_suf, *fname = file->basename; + uint32 lowest_dist = 0x7FFFFFFF; + int j, lowest_j = -1; + + fname_len = strlen(fname); + fname_suf = find_filename_suffix(fname, fname_len, &fname_suf_len); + + for (j = 0; j < dirlist->count; j++) { + struct file_struct *fp = dirlist->files[j]; + const char *suf, *name; + int len, suf_len; + uint32 dist; + + if (!S_ISREG(fp->mode) || !fp->length + || fp->flags & FLAG_NO_FUZZY) + continue; -/* - * Acts on file number @p i from @p flist, whose name is @p fname. - * - * First fixes up permissions, then generates checksums for the file. + name = fp->basename; + + if (fp->length == file->length + && fp->modtime == file->modtime) { + if (verbose > 4) { + rprintf(FINFO, + "fuzzy size/modtime match for %s\n", + name); + } + return j; + } + + len = strlen(name); + suf = find_filename_suffix(name, len, &suf_len); + + dist = fuzzy_distance(name, len, fname, fname_len); + /* Add some extra weight to how well the suffixes match. */ + dist += fuzzy_distance(suf, suf_len, fname_suf, fname_suf_len) + * 10; + if (verbose > 4) { + rprintf(FINFO, "fuzzy distance for %s = %d.%05d\n", + name, (int)(dist>>16), (int)(dist&0xFFFF)); + } + if (dist <= lowest_dist) { + lowest_dist = dist; + lowest_j = j; + } + } + + return lowest_j; +} + + +/* Acts on flist->file's ndx'th item, whose name is fname. If a directory, + * make sure it exists, and has the right permissions/timestamp info. For + * all other non-regular files (symlinks, etc.) we create them here. For + * regular files that have changed, we try to find a basis file and then + * start sending checksums. * - * @note This comment was added later by mbp who was trying to work it - * out. It might be wrong. - */ -static void recv_generator(char *fname, struct file_struct *file, int i, - int f_out) + * Note that f_out is set to -1 when doing final directory-permission and + * modification-time repair. */ +static void recv_generator(char *fname, struct file_list *flist, + struct file_struct *file, int ndx, + int f_out, int f_out_name) { - int fd; + static int missing_below = -1; + static char *fuzzy_dirname = NULL; + static struct file_list *fuzzy_dirlist = NULL; + struct file_struct *fuzzy_file = NULL; + int fd = -1, f_copy = -1; STRUCT_STAT st, partial_st; + struct file_struct *back_file = NULL; int statret, stat_errno; - char *fnamecmp, *partialptr; + char *fnamecmp, *partialptr, *backupptr = NULL; char fnamecmpbuf[MAXPATHLEN]; + uchar fnamecmp_type; if (list_only) return; - if (verbose > 2) - rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), i); + if (!fname) { + if (fuzzy_dirlist) { + flist_free(fuzzy_dirlist); + fuzzy_dirlist = NULL; + fuzzy_dirname = NULL; + } + if (missing_below >= 0) { + dry_run--; + missing_below = -1; + } + return; + } - if (server_exclude_list.head - && check_exclude(&server_exclude_list, fname, - S_ISDIR(file->mode)) < 0) { + if (verbose > 2) { + rprintf(FINFO, "recv_generator(%s,%d)\n", + safe_fname(fname), ndx); + } + + if (server_filter_list.head + && check_filter(&server_filter_list, fname, + S_ISDIR(file->mode)) < 0) { if (verbose) { rprintf(FINFO, "skipping server-excluded file \"%s\"\n", safe_fname(fname)); @@ -273,10 +377,26 @@ static void recv_generator(char *fname, struct file_struct *file, int i, return; } + if (missing_below >= 0 && file->dir.depth <= missing_below) { + dry_run--; + missing_below = -1; + } if (dry_run > 1) { statret = -1; stat_errno = ENOENT; } else { + if (fuzzy_basis && S_ISREG(file->mode)) { + char *dn = file->dirname ? file->dirname : "."; + /* Yes, identical dirnames are guaranteed to have + * identical pointers at this point. */ + if (fuzzy_dirname != dn) { + if (fuzzy_dirlist) + flist_free(fuzzy_dirlist); + fuzzy_dirname = dn; + fuzzy_dirlist = get_dirlist(fuzzy_dirname, 1); + } + } + statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode)); stat_errno = errno; @@ -305,72 +425,88 @@ 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 (dry_run && statret != 0 && missing_below < 0) { + missing_below = file->dir.depth; + dry_run++; + } + if (protocol_version >= 29 && f_out != -1) + itemize(file, statret, &st, 0, f_out, ndx); 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)); } } - /* f_out is set to -1 when doing final directory-permission - * and modification-time repair. */ if (set_perms(fname, file, statret ? NULL : &st, 0) - && verbose && f_out != -1) + && verbose && protocol_version < 29 && f_out != -1) rprintf(FINFO, "%s/\n", safe_fname(fname)); + if (delete_during && f_out != -1 && csum_length != SUM_LENGTH + && (file->flags & FLAG_DEL_HERE)) + delete_in_dir(flist, fname, file); + return; + } + + if (max_size && file->length > max_size) { + if (verbose > 1) { + rprintf(FINFO, "%s is over max-size\n", + safe_fname(fname)); + } return; } if (preserve_links && S_ISLNK(file->mode)) { -#if SUPPORT_LINKS - char lnk[MAXPATHLEN]; - int l; - +#ifdef SUPPORT_LINKS if (safe_symlinks && unsafe_symlink(file->u.link, fname)) { if (verbose) { - rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n", - full_fname(fname), file->u.link); + rprintf(FINFO, + "ignoring unsafe symlink %s -> \"%s\"\n", + full_fname(fname), + safe_fname(file->u.link)); } 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) { + if (protocol_version >= 29) { + itemize(file, 0, &st, 0, + f_out, ndx); + } 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", full_fname(fname), safe_fname(file->u.link)); } else { set_perms(fname,file,NULL,0); - if (verbose) { + if (protocol_version >= 29) { + itemize(file, statret, &st, SID_UPDATING, + f_out, ndx); + } else if (verbose) { rprintf(FINFO, "%s -> %s\n", safe_fname(fname), safe_fname(file->u.link)); } @@ -379,12 +515,16 @@ static void recv_generator(char *fname, struct file_struct *file, int i, return; } -#ifdef HAVE_MKNOD if (am_root && preserve_devices && IS_DEVICE(file->mode)) { 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; + if (protocol_version >= 29) { + itemize(file, statret, &st, SID_UPDATING, + f_out, ndx); + } + delete_file(fname, dflag | DEL_TERSE); if (verbose > 2) { rprintf(FINFO,"mknod(%s,0%o,0x%x)\n", safe_fname(fname), @@ -395,17 +535,20 @@ static void recv_generator(char *fname, struct file_struct *file, int i, full_fname(fname)); } else { set_perms(fname,file,NULL,0); - if (verbose) { + if (verbose && protocol_version < 29) { rprintf(FINFO, "%s\n", safe_fname(fname)); } } } else { + if (protocol_version >= 29) { + itemize(file, statret, &st, 0, + f_out, ndx); + } set_perms(fname, file, &st, PERMS_REPORT); } return; } -#endif if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER)) return; @@ -417,53 +560,103 @@ static void recv_generator(char *fname, struct file_struct *file, int i, } fnamecmp = fname; + fnamecmp_type = FNAMECMP_FNAME; - if (statret == -1 && compare_dest != NULL) { - /* try the file at compare_dest instead */ - pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest, fname); - if (link_stat(fnamecmpbuf, &st, 0) == 0 - && S_ISREG(st.st_mode)) { -#if HAVE_LINK - if (link_dest && !dry_run) { + if (statret != 0 && basis_dir[0] != NULL) { + int fallback_match = -1; + int match_level = 0; + int i = 0; + do { + pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, + basis_dir[i], fname); + if (link_stat(fnamecmpbuf, &st, 0) == 0 + && S_ISREG(st.st_mode)) { + statret = 0; + if (link_dest) { + if (!match_level) { + fallback_match = i; + match_level = 1; + } else if (match_level == 2 + && !unchanged_attrs(file, &st)) + continue; + if (!unchanged_file(fnamecmpbuf, file, &st)) + continue; + fallback_match = i; + match_level = 2; + if (!unchanged_attrs(file, &st)) + continue; + } + match_level = 3; + break; + } + } while (basis_dir[++i] != NULL); + if (statret == 0) { + if (match_level < 3) { + i = fallback_match; + pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, + basis_dir[i], fname); + } +#ifdef HAVE_LINK + if (link_dest && match_level == 3 && !dry_run) { if (do_link(fnamecmpbuf, fname) < 0) { if (verbose) { rsyserr(FINFO, errno, "link %s => %s", - fnamecmpbuf, + full_fname(fnamecmpbuf), safe_fname(fname)); } fnamecmp = fnamecmpbuf; + fnamecmp_type = i; } } else #endif + { fnamecmp = fnamecmpbuf; - statret = 0; + 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) + if (statret != 0) goto prepare_to_open; } else partialptr = NULL; - if (statret == -1) { + if (statret != 0 && fuzzy_basis && dry_run <= 1) { + int j = find_fuzzy(file, fuzzy_dirlist); + if (j >= 0) { + fuzzy_file = fuzzy_dirlist->files[j]; + f_name_to(fuzzy_file, fnamecmpbuf); + if (verbose > 2) { + rprintf(FINFO, "fuzzy basis selected for %s: %s\n", + safe_fname(fname), safe_fname(fnamecmpbuf)); + } + st.st_mode = fuzzy_file->mode; + st.st_size = fuzzy_file->length; + st.st_mtime = fuzzy_file->modtime; + statret = 0; + fnamecmp = fnamecmpbuf; + fnamecmp_type = FNAMECMP_FUZZY; + } + } + + if (statret != 0) { if (preserve_hard_links && hard_link_check(file, HL_SKIP)) return; - if (stat_errno == ENOENT) { - write_int(f_out,i); - if (!dry_run && !read_batch) - write_sum_head(f_out, NULL); - } else if (verbose > 1) { + if (stat_errno == ENOENT) + goto notify_others; + if (verbose > 1) { rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s", full_fname(fname)); @@ -471,40 +664,55 @@ static void recv_generator(char *fname, struct file_struct *file, int i, return; } - if (opt_ignore_existing && fnamecmp == fname) { + if (opt_ignore_existing && fnamecmp_type == FNAMECMP_FNAME) { if (verbose > 1) rprintf(FINFO, "%s exists\n", safe_fname(fname)); return; } - if (update_only && fnamecmp == fname + if (update_only && fnamecmp_type == FNAMECMP_FNAME && cmp_modtime(st.st_mtime, file->modtime) > 0) { if (verbose > 1) rprintf(FINFO, "%s is newer\n", safe_fname(fname)); return; } - if (skip_file(fnamecmp, file, &st)) { - if (fnamecmp == fname) + if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) + ; + else if (fnamecmp_type == FNAMECMP_FUZZY) + ; + else if (unchanged_file(fnamecmp, file, &st)) { + if (protocol_version >= 29) { + itemize(file, statret, &st, + fnamecmp_type == FNAMECMP_FNAME + ? 0 : SID_NO_DEST_AND_NO_UPDATE, + f_out, ndx); + } + if (fnamecmp_type == FNAMECMP_FNAME) set_perms(fname, file, &st, PERMS_REPORT); return; } prepare_to_open: - if (dry_run || read_batch) { - write_int(f_out,i); - return; + if (partialptr) { + st = partial_st; + fnamecmp = partialptr; + fnamecmp_type = FNAMECMP_PARTIAL_DIR; + statret = 0; } + if (dry_run || read_batch) + goto notify_others; if (whole_file > 0) { - write_int(f_out,i); - write_sum_head(f_out, NULL); - return; + if (statret == 0) + statret = 1; + goto notify_others; } - if (partialptr) { - st = partial_st; - fnamecmp = partialptr; + if (fuzzy_basis) { + int j = flist_find(fuzzy_dirlist, file); + if (j >= 0) /* don't use changing file as future fuzzy basis */ + fuzzy_dirlist->files[j]->flags |= FLAG_NO_FUZZY; } /* open the file */ @@ -513,12 +721,39 @@ prepare_to_open: if (fd == -1) { rsyserr(FERROR, errno, "failed to open %s, continuing", full_fname(fnamecmp)); + pretend_missing: /* pretend the file didn't exist */ if (preserve_hard_links && hard_link_check(file, HL_SKIP)) return; - write_int(f_out,i); - write_sum_head(f_out, NULL); - return; + statret = -1; + goto notify_others; + } + + if (inplace && make_backups) { + if (!(backupptr = get_backup_name(fname))) { + close(fd); + return; + } + if (!(back_file = make_file(fname, NULL, NO_FILTERS))) { + close(fd); + goto pretend_missing; + } + if (robust_unlink(backupptr) && errno != ENOENT) { + rsyserr(FERROR, errno, "unlink %s", + full_fname(backupptr)); + free(back_file); + close(fd); + return; + } + if ((f_copy = do_open(backupptr, + O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) { + rsyserr(FERROR, errno, "open %s", + full_fname(backupptr)); + free(back_file); + close(fd); + return; + } + fnamecmp_type = FNAMECMP_BACKUP; } if (verbose > 3) { @@ -527,20 +762,68 @@ prepare_to_open: } if (verbose > 2) - rprintf(FINFO, "generating and sending sums for %d\n", i); + rprintf(FINFO, "generating and sending sums for %d\n", ndx); + +notify_others: + write_int(f_out, ndx); + if (protocol_version >= 29) { + itemize(file, statret, &st, SID_UPDATING + | (always_checksum ? SID_REPORT_CHECKSUM : 0), + f_out, -1); + if (inplace && !read_batch) + write_byte(f_out, fnamecmp_type); + } + if (f_out_name >= 0) { + write_byte(f_out_name, fnamecmp_type); + if (fnamecmp_type == FNAMECMP_FUZZY) { + uchar lenbuf[3], *lb = lenbuf; + int len = strlen(fuzzy_file->basename); + if (len > 0x7F) { +#if MAXPATHLEN > 0x7FFF + *lb++ = len / 0x10000 + 0x80; + *lb++ = len / 0x100; +#else + *lb++ = len / 0x100 + 0x80; +#endif + } + *lb = len; + write_buf(f_out_name, lenbuf, lb - lenbuf + 1); + write_buf(f_out_name, fuzzy_file->basename, len); + } + } + + if (dry_run || read_batch) + return; - write_int(f_out,i); - generate_and_send_sums(fd, st.st_size, f_out); + if (statret == 0) { + generate_and_send_sums(fd, st.st_size, f_out, f_copy); - close(fd); + if (f_copy >= 0) { + close(f_copy); + set_perms(backupptr, back_file, NULL, 0); + if (verbose > 1) { + rprintf(FINFO, "backed up %s to %s\n", + safe_fname(fname), safe_fname(backupptr)); + } + free(back_file); + } + + close(fd); + } else + write_sum_head(f_out, NULL); } -void generate_files(int f_out, struct file_list *flist, char *local_name) +void generate_files(int f_out, struct file_list *flist, char *local_name, + int f_out_name) { int i; int phase = 0; char fbuf[MAXPATHLEN]; + int need_retouch_dir_times = preserve_times && !omit_dir_times; + int need_retouch_dir_perms = 0; + int save_only_existing = only_existing; + int save_opt_ignore_existing = opt_ignore_existing; if (verbose > 2) { rprintf(FINFO, "generator starting pid=%ld count=%d\n", @@ -554,9 +837,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) : "delta transmission enabled\n"); } - /* we expect to just sit around now, so don't exit on a - timeout. If we really get a timeout then the other process should - exit */ + /* We expect to just sit around now, so don't exit on a timeout. + * If we really get a timeout then the other process should exit. */ io_timeout = 0; for (i = 0; i < flist->count; i++) { @@ -565,23 +847,28 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (!file->basename) continue; - /* we need to ensure that any directories we create have writeable - permissions initially so that we can create the files within - them. This is then fixed after the files are transferred */ + + /* We need to ensure that any dirs we create have writeable + * permissions during the time we are putting files within + * them. This is then fixed after the transfer is done. */ if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)) { copy = *file; - /* XXX: Could this be causing a problem on SCO? Perhaps their - * handling of permissions is strange? */ copy.mode |= S_IWUSR; /* user write */ file = © + need_retouch_dir_perms = 1; } recv_generator(local_name ? local_name : f_name_to(file, fbuf), - file, i, f_out); + flist, file, i, f_out, f_out_name); } + recv_generator(NULL, NULL, NULL, 0, -1, -1); + if (delete_during) + delete_in_dir(NULL, NULL, NULL); phase++; csum_length = SUM_LENGTH; + only_existing = max_size = opt_ignore_existing = 0; + update_only = always_checksum = size_only = 0; ignore_times = 1; if (verbose > 2) @@ -594,27 +881,40 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) while ((i = get_redo_num()) != -1) { struct file_struct *file = flist->files[i]; recv_generator(local_name ? local_name : f_name_to(file, fbuf), - file, i, f_out); + flist, file, i, f_out, f_out_name); } phase++; + only_existing = save_only_existing; + opt_ignore_existing = save_opt_ignore_existing; + if (verbose > 2) rprintf(FINFO,"generate_files phase=%d\n",phase); 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(); - /* now we need to fix any directory permissions that were - * modified during the transfer */ - for (i = 0; i < flist->count; i++) { - struct file_struct *file = flist->files[i]; - if (!file->basename || !S_ISDIR(file->mode)) - continue; - recv_generator(local_name ? local_name : f_name(file), - file, i, -1); + if ((need_retouch_dir_perms || need_retouch_dir_times) + && !list_only && !local_name && !dry_run) { + /* Now we need to fix any directory permissions that were + * modified during the transfer and/or re-set any tweaked + * modified-time values. */ + for (i = 0; i < flist->count; i++) { + struct file_struct *file = flist->files[i]; + if (!file->basename || !S_ISDIR(file->mode)) + continue; + if (!need_retouch_dir_times && file->mode & S_IWUSR) + continue; + recv_generator(local_name ? local_name : f_name(file), + flist, file, i, -1, -1); + } } + recv_generator(NULL, NULL, NULL, 0, -1, -1); if (verbose > 2) rprintf(FINFO,"generate_files finished\n");