X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3447d61048dbdaf514ba7ec3d6fd37a57d722e9f..904e5af12874694c47b7ccf7b8b2e6aa883cab0f:/generator.c diff --git a/generator.c b/generator.c index bbbc05f6..c5facb7c 100644 --- a/generator.c +++ b/generator.c @@ -35,15 +35,18 @@ extern int am_daemon; extern int do_progress; extern int recurse; extern int relative_paths; +extern int implied_dirs; extern int keep_dirlinks; extern int preserve_links; extern int preserve_devices; +extern int preserve_specials; 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_mode; extern int delete_before; extern int delete_during; extern int delete_after; @@ -78,7 +81,6 @@ extern int link_dest; extern int whole_file; extern int list_only; extern int read_batch; -extern int orig_umask; extern int safe_symlinks; extern long block_size; /* "long" because popt can't set an int32. */ extern int max_delete; @@ -143,7 +145,7 @@ static int delete_item(char *fname, int mode, int flags) return -1; } - zap_dir = flags & DEL_FORCE_RECURSE || (force_delete && recurse); + zap_dir = flags & DEL_FORCE_RECURSE || force_delete; if ((max_delete && ++deletion_count > max_delete) || (dry_run && zap_dir)) { ok = 0; @@ -217,14 +219,13 @@ static int delete_item(char *fname, int mode, int flags) * call will append names onto the end, but the old dir value will be restored * on exit). */ static void delete_in_dir(struct file_list *flist, char *fbuf, - struct file_struct *file) + struct file_struct *file, STRUCT_STAT *stp) { static int min_depth = MAXPATHLEN, cur_depth = -1; static void *filt_array[MAXPATHLEN/2+1]; static int already_warned = 0; struct file_list *dirlist; char delbuf[MAXPATHLEN]; - STRUCT_STAT st; int dlen, i; if (!flist) { @@ -236,7 +237,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, } if (verbose > 2) - rprintf(FINFO, "delete_in_dir(%s)\n", safe_fname(fbuf)); + rprintf(FINFO, "delete_in_dir(%s)\n", fbuf); if (allowed_lull) maybe_send_keepalive(); @@ -261,13 +262,10 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, dlen = strlen(fbuf); filt_array[cur_depth] = push_local_filters(fbuf, dlen); - if (link_stat(fbuf, &st, keep_dirlinks) < 0) - return; - if (one_file_system) { if (file->flags & FLAG_TOP_DIR) - filesystem_dev = st.st_dev; - else if (filesystem_dev != st.st_dev) + filesystem_dev = stp->st_dev; + else if (filesystem_dev != stp->st_dev) return; } @@ -280,9 +278,8 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, if (!fp->basename || fp->flags & FLAG_MOUNT_POINT) continue; if (flist_find(flist, fp) < 0) { - int mode = fp->mode; - f_name_to(fp, delbuf); - delete_item(delbuf, mode, DEL_FORCE_RECURSE); + f_name(fp, delbuf); + delete_item(delbuf, fp->mode, DEL_FORCE_RECURSE); } } @@ -294,6 +291,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, static void do_delete_pass(struct file_list *flist) { char fbuf[MAXPATHLEN]; + STRUCT_STAT st; int j; if (dry_run > 1 /* destination doesn't exist yet */ @@ -306,13 +304,17 @@ static void do_delete_pass(struct file_list *flist) if (!(file->flags & FLAG_DEL_HERE)) continue; - f_name_to(file, fbuf); + f_name(file, fbuf); if (verbose > 1 && file->flags & FLAG_TOP_DIR) - rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf)); + rprintf(FINFO, "deleting in %s\n", fbuf); + + if (link_stat(fbuf, &st, keep_dirlinks) < 0 + || !S_ISDIR(st.st_mode)) + continue; - delete_in_dir(flist, fbuf, file); + delete_in_dir(flist, fbuf, file, &st); } - delete_in_dir(NULL, NULL, NULL); + delete_in_dir(NULL, NULL, NULL, NULL); if (do_progress && !am_server) rprintf(FINFO, " \r"); @@ -345,10 +347,9 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, iflags |= ITEM_REPORT_SIZE; if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) - || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0)) + || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0)) iflags |= ITEM_REPORT_TIME; - if (preserve_perms - && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS)) + if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS)) iflags |= ITEM_REPORT_PERMS; if (preserve_uid && am_root && file->uid != st->st_uid) iflags |= ITEM_REPORT_OWNER; @@ -360,7 +361,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, iflags &= 0xffff; if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1 - || (xname && *xname)) && !read_batch) { + || log_format_has_i > 1 || (xname && *xname)) && !read_batch) { if (protocol_version >= 29) { if (ndx >= 0) write_int(sock_f_out, ndx); @@ -395,7 +396,7 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) if (ignore_times) return 0; - return cmp_modtime(st->st_mtime, file->modtime) == 0; + return cmp_time(st->st_mtime, file->modtime) == 0; } @@ -555,7 +556,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) name = fp->basename; if (fp->length == file->length - && cmp_modtime(fp->modtime, file->modtime) == 0) { + && cmp_time(fp->modtime, file->modtime) == 0) { if (verbose > 4) { rprintf(FINFO, "fuzzy size/modtime match for %s\n", @@ -606,7 +607,7 @@ void check_for_finished_hlinks(int itemizing, enum logcode code) * value if we found an alternate basis file. */ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, char *cmpbuf, STRUCT_STAT *stp, int itemizing, - int maybe_PERMS_REPORT, enum logcode code) + int maybe_ATTRS_REPORT, enum logcode code) { int best_match = -1; int match_level = 0; @@ -631,7 +632,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, if (!unchanged_attrs(file, stp)) continue; if ((always_checksum || ignore_times) - && cmp_modtime(stp->st_mtime, file->modtime)) + && cmp_time(stp->st_mtime, file->modtime)) continue; best_match = j; match_level = 3; @@ -662,10 +663,10 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, hard_link_cluster(file, ndx, itemizing, code); } else if (itemizing) itemize(file, ndx, 0, stp, 0, 0, NULL); - if (verbose > 1 && maybe_PERMS_REPORT) { + if (verbose > 1 && maybe_ATTRS_REPORT) { code = daemon_log_format_has_i || dry_run ? FCLIENT : FINFO; - rprintf(code, "%s is uptodate\n", safe_fname(fname)); + rprintf(code, "%s is uptodate\n", fname); } return -2; } @@ -676,19 +677,19 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, if (copy_file(cmpbuf, fname, file->mode) < 0) { if (verbose) { rsyserr(FINFO, errno, "copy_file %s => %s", - full_fname(cmpbuf), safe_fname(fname)); + full_fname(cmpbuf), fname); } return -1; } if (itemizing) itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL); - set_perms(fname, file, NULL, 0); - if (maybe_PERMS_REPORT + set_file_attrs(fname, file, NULL, 0); + if (maybe_ATTRS_REPORT && ((!itemizing && verbose && match_level == 2) || (verbose > 1 && match_level == 3))) { code = daemon_log_format_has_i || dry_run ? FCLIENT : FINFO; - rprintf(code, "%s%s\n", safe_fname(fname), + rprintf(code, "%s%s\n", fname, match_level == 3 ? " is uptodate" : ""); } if (preserve_hard_links && file->link_u.links) @@ -703,7 +704,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, * handling the file, or -1 if no dest-linking occurred. */ static int try_dests_non(struct file_struct *file, char *fname, int ndx, int itemizing, int *possible_ptr, - int maybe_PERMS_REPORT, enum logcode code) + int maybe_ATTRS_REPORT, enum logcode code) { char fnamebuf[MAXPATHLEN], lnk[MAXPATHLEN]; STRUCT_STAT st; @@ -715,10 +716,12 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, || !unchanged_attrs(file, &st)) continue; if (S_ISLNK(file->mode)) { +#ifdef SUPPORT_LINKS if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0) continue; lnk[len] = '\0'; if (strcmp(lnk, file->u.link) != 0) +#endif continue; } else { if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev) @@ -739,10 +742,10 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, char *lp = link_dest ? "" : NULL; itemize(file, ndx, 0, &st, changes, 0, lp); } - if (verbose > 1 && maybe_PERMS_REPORT) { + if (verbose > 1 && maybe_ATTRS_REPORT) { code = daemon_log_format_has_i || dry_run ? FCLIENT : FINFO; - rprintf(code, "%s is uptodate\n", safe_fname(fname)); + rprintf(code, "%s is uptodate\n", fname); } return -2; } while (basis_dir[++i] != NULL); @@ -763,12 +766,13 @@ static int phase = 0; * 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_struct *file, int ndx, - int itemizing, int maybe_PERMS_REPORT, + int itemizing, int maybe_ATTRS_REPORT, enum logcode code, int f_out) { static int missing_below = -1, excluded_below = -1; - static char *fuzzy_dirname = ""; + static char *parent_dirname = ""; static struct file_list *fuzzy_dirlist = NULL; + static int need_fuzzy_dirlist = 0; struct file_struct *fuzzy_file = NULL; int fd = -1, f_copy = -1; STRUCT_STAT st, real_st, partial_st; @@ -777,6 +781,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, char *fnamecmp, *partialptr, *backupptr = NULL; char fnamecmpbuf[MAXPATHLEN]; uchar fnamecmp_type; + int del_opts = DEL_TERSE | (delete_mode ? DEL_FORCE_RECURSE : 0); if (list_only) return; @@ -785,19 +790,17 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (fuzzy_dirlist) { flist_free(fuzzy_dirlist); fuzzy_dirlist = NULL; - fuzzy_dirname = ""; } if (missing_below >= 0) { dry_run--; missing_below = -1; } + parent_dirname = ""; return; } - if (verbose > 2) { - rprintf(FINFO, "recv_generator(%s,%d)\n", - safe_fname(fname), ndx); - } + if (verbose > 2) + rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx); if (server_filter_list.head) { if (excluded_below >= 0) { @@ -813,7 +816,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (verbose) { rprintf(FINFO, "skipping server-excluded file \"%s\"\n", - safe_fname(fname)); + fname); } return; } @@ -827,15 +830,26 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, statret = -1; stat_errno = ENOENT; } else { - if (fuzzy_basis && S_ISREG(file->mode)) { - char *dn = file->dirname ? file->dirname : "."; - if (fuzzy_dirname != dn - && strcmp(fuzzy_dirname, dn) != 0) { - if (fuzzy_dirlist) - flist_free(fuzzy_dirlist); - fuzzy_dirlist = get_dirlist(dn, -1, 1); + char *dn = file->dirname ? file->dirname : "."; + if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) { + if (relative_paths && !implied_dirs && stat(dn, &st) < 0 + && create_directory_path(fname) < 0) { + rsyserr(FERROR, errno, + "recv_generator: mkdir %s failed", + full_fname(dn)); } - fuzzy_dirname = dn; + if (fuzzy_dirlist) { + flist_free(fuzzy_dirlist); + fuzzy_dirlist = NULL; + } + if (fuzzy_basis) + need_fuzzy_dirlist = 1; + } + parent_dirname = dn; + + if (need_fuzzy_dirlist && S_ISREG(file->mode)) { + fuzzy_dirlist = get_dirlist(dn, -1, 1); + need_fuzzy_dirlist = 0; } statret = link_stat(fname, &st, @@ -847,18 +861,17 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (verbose > 1) { rprintf(FINFO, "not creating new %s \"%s\"\n", S_ISDIR(file->mode) ? "directory" : "file", - safe_fname(fname)); + fname); } return; } - if (statret == 0 && !preserve_perms - && S_ISDIR(st.st_mode) == S_ISDIR(file->mode)) { - /* if the file exists already and we aren't perserving - * permissions then act as though the remote end sent - * us the file permissions we already have */ - file->mode = (file->mode & ~CHMOD_BITS) - | (st.st_mode & CHMOD_BITS); + /* If we're not preserving permissions, change the file-list's + * mode based on the local permissions and some heuristics. */ + if (!preserve_perms) { + int exists = statret == 0 + && S_ISDIR(st.st_mode) == S_ISDIR(file->mode); + file->mode = dest_mode(file->mode, st.st_mode, exists); } if (S_ISDIR(file->mode)) { @@ -868,7 +881,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, * we need to delete it. If it doesn't exist, then * (perhaps recursively) create it. */ if (statret == 0 && !S_ISDIR(st.st_mode)) { - if (delete_item(fname, st.st_mode, DEL_TERSE) < 0) + if (delete_item(fname, st.st_mode, del_opts) < 0) return; statret = -1; } @@ -882,19 +895,19 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) { if (!relative_paths || errno != ENOENT - || create_directory_path(fname, orig_umask) < 0 + || create_directory_path(fname) < 0 || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) { rsyserr(FERROR, errno, "recv_generator: mkdir %s failed", full_fname(fname)); } } - if (set_perms(fname, file, statret ? NULL : &st, 0) + if (set_file_attrs(fname, file, statret ? NULL : &st, 0) && verbose && code && f_out != -1) - rprintf(code, "%s/\n", safe_fname(fname)); + rprintf(code, "%s/\n", fname); if (delete_during && f_out != -1 && !phase && dry_run < 2 && (file->flags & FLAG_DEL_HERE)) - delete_in_dir(the_file_list, fname, file); + delete_in_dir(the_file_list, fname, file, &st); return; } @@ -908,11 +921,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (safe_symlinks && unsafe_symlink(file->u.link, fname)) { if (verbose) { if (the_file_list->count == 1) - fname = f_name(file); + fname = f_name(file, NULL); rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n", - full_fname(fname), - safe_fname(file->u.link)); + full_fname(fname), file->u.link); } return; } @@ -931,8 +943,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, itemize(file, ndx, 0, &st, 0, 0, NULL); } - set_perms(fname, file, &st, - maybe_PERMS_REPORT); + set_file_attrs(fname, file, &st, + maybe_ATTRS_REPORT); if (preserve_hard_links && file->link_u.links) { hard_link_cluster(file, ndx, @@ -944,14 +956,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } /* Not the right symlink (or not a symlink), so * delete it. */ - if (delete_item(fname, st.st_mode, DEL_TERSE) < 0) + if (delete_item(fname, st.st_mode, del_opts) < 0) return; if (!S_ISLNK(st.st_mode)) statret = -1; } else if (basis_dir[0] != NULL && can_link_symlinks) { if (try_dests_non(file, fname, ndx, itemizing, &can_link_symlinks, - maybe_PERMS_REPORT, code) == -2) { + maybe_ATTRS_REPORT, code) == -2) { if (!copy_dest) return; itemizing = code = 0; @@ -963,16 +975,16 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, return; if (do_symlink(file->u.link,fname) != 0) { rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed", - full_fname(fname), safe_fname(file->u.link)); + full_fname(fname), file->u.link); } else { - set_perms(fname,file,NULL,0); + set_file_attrs(fname, file, NULL, 0); if (itemizing) { itemize(file, ndx, statret, &st, ITEM_LOCAL_CHANGE, 0, NULL); } if (code && verbose) { - rprintf(code, "%s -> %s\n", safe_fname(fname), - safe_fname(file->u.link)); + rprintf(code, "%s -> %s\n", fname, + file->u.link); } if (remove_sent_files && !dry_run) { char numbuf[4]; @@ -986,12 +998,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, return; } - if (am_root && preserve_devices && IS_DEVICE(file->mode)) { + if ((am_root && preserve_devices && IS_DEVICE(file->mode)) + || (preserve_specials && IS_SPECIAL(file->mode))) { if (statret != 0 && (basis_dir[0] != NULL && can_link_devices)) { if (try_dests_non(file, fname, ndx, itemizing, &can_link_devices, - maybe_PERMS_REPORT, code) == -2) { + maybe_ATTRS_REPORT, code) == -2) { if (!copy_dest) return; itemizing = code = 0; @@ -1001,32 +1014,31 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, || (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS) || st.st_rdev != file->u.rdev) { if (statret == 0 - && delete_item(fname, st.st_mode, DEL_TERSE) < 0) + && delete_item(fname, st.st_mode, del_opts) < 0) return; if (preserve_hard_links && file->link_u.links && hard_link_check(file, ndx, fname, -1, &st, itemizing, code, HL_SKIP)) return; - if (!IS_DEVICE(st.st_mode)) + if ((IS_DEVICE(file->mode) && !IS_DEVICE(st.st_mode)) + || (IS_SPECIAL(file->mode) && !IS_SPECIAL(st.st_mode))) statret = -1; if (verbose > 2) { rprintf(FINFO,"mknod(%s,0%o,0x%x)\n", - safe_fname(fname), + fname, (int)file->mode, (int)file->u.rdev); } if (do_mknod(fname,file->mode,file->u.rdev) < 0) { rsyserr(FERROR, errno, "mknod %s failed", full_fname(fname)); } else { - set_perms(fname,file,NULL,0); + set_file_attrs(fname, file, NULL, 0); if (itemizing) { itemize(file, ndx, statret, &st, ITEM_LOCAL_CHANGE, 0, NULL); } - if (code && verbose) { - rprintf(code, "%s\n", - safe_fname(fname)); - } + if (code && verbose) + rprintf(code, "%s\n", fname); if (preserve_hard_links && file->link_u.links) { hard_link_cluster(file, ndx, itemizing, code); @@ -1035,7 +1047,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } else { if (itemizing) itemize(file, ndx, statret, &st, 0, 0, NULL); - set_perms(fname, file, &st, maybe_PERMS_REPORT); + set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT); if (preserve_hard_links && file->link_u.links) hard_link_cluster(file, ndx, itemizing, code); } @@ -1044,41 +1056,38 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (!S_ISREG(file->mode)) { if (the_file_list->count == 1) - fname = f_name(file); - rprintf(FINFO, "skipping non-regular file \"%s\"\n", - safe_fname(fname)); + fname = f_name(file, NULL); + rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname); return; } if (max_size && file->length > max_size) { if (verbose > 1) { if (the_file_list->count == 1) - fname = f_name(file); - rprintf(FINFO, "%s is over max-size\n", - safe_fname(fname)); + fname = f_name(file, NULL); + rprintf(FINFO, "%s is over max-size\n", fname); } return; } if (min_size && file->length < min_size) { if (verbose > 1) { if (the_file_list->count == 1) - fname = f_name(file); - rprintf(FINFO, "%s is under min-size\n", - safe_fname(fname)); + fname = f_name(file, NULL); + rprintf(FINFO, "%s is under min-size\n", fname); } return; } if (ignore_existing && statret == 0) { if (verbose > 1) - rprintf(FINFO, "%s exists\n", safe_fname(fname)); + rprintf(FINFO, "%s exists\n", fname); return; } if (update_only && statret == 0 - && cmp_modtime(st.st_mtime, file->modtime) > 0) { + && cmp_time(st.st_mtime, file->modtime) > 0) { if (verbose > 1) - rprintf(FINFO, "%s is newer\n", safe_fname(fname)); + rprintf(FINFO, "%s is newer\n", fname); return; } @@ -1086,7 +1095,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, fnamecmp_type = FNAMECMP_FNAME; if (statret == 0 && !S_ISREG(st.st_mode)) { - if (delete_item(fname, st.st_mode, DEL_TERSE) != 0) + if (delete_item(fname, st.st_mode, del_opts) != 0) return; statret = -1; stat_errno = ENOENT; @@ -1094,7 +1103,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (statret != 0 && basis_dir[0] != NULL) { int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st, - itemizing, maybe_PERMS_REPORT, code); + itemizing, maybe_ATTRS_REPORT, code); if (j == -2) return; if (j != -1) { @@ -1115,14 +1124,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } else partialptr = NULL; - if (statret != 0 && fuzzy_basis && dry_run <= 1) { + if (statret != 0 && fuzzy_dirlist && 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); + f_name(fuzzy_file, fnamecmpbuf); if (verbose > 2) { rprintf(FINFO, "fuzzy basis selected for %s: %s\n", - safe_fname(fname), safe_fname(fnamecmpbuf)); + fname, fnamecmpbuf); } st.st_size = fuzzy_file->length; statret = 0; @@ -1159,7 +1168,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, itemize(file, ndx, real_ret, &real_st, 0, 0, NULL); } - set_perms(fname, file, &st, maybe_PERMS_REPORT); + set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT); if (preserve_hard_links && file->link_u.links) hard_link_cluster(file, ndx, itemizing, code); return; @@ -1176,7 +1185,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (!do_xfers || read_batch || whole_file) goto notify_others; - if (fuzzy_basis) { + if (fuzzy_dirlist) { 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; @@ -1203,7 +1212,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, close(fd); return; } - if (!(back_file = make_file(fname, NULL, NO_FILTERS))) { + if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) { close(fd); goto pretend_missing; } @@ -1227,13 +1236,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (verbose > 3) { rprintf(FINFO, "gen mapped %s of size %.0f\n", - safe_fname(fnamecmp), (double)st.st_size); + fnamecmp, (double)st.st_size); } if (verbose > 2) rprintf(FINFO, "generating and sending sums for %d\n", ndx); notify_others: + if (remove_sent_files && !delay_updates && !phase) + increment_active_files(ndx, itemizing, code); write_int(f_out, ndx); if (itemizing) { int iflags = ITEM_TRANSFER; @@ -1264,10 +1275,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (f_copy >= 0) { close(f_copy); - set_perms(backupptr, back_file, NULL, 0); + set_file_attrs(backupptr, back_file, NULL, 0); if (verbose > 1) { rprintf(FINFO, "backed up %s to %s\n", - safe_fname(fname), safe_fname(backupptr)); + fname, backupptr); } free(back_file); } @@ -1275,12 +1286,11 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, close(fd); } - void generate_files(int f_out, struct file_list *flist, char *local_name) { int i; char fbuf[MAXPATHLEN]; - int itemizing, maybe_PERMS_REPORT; + int itemizing, maybe_ATTRS_REPORT; enum logcode code; int lull_mod = allowed_lull * 5; int need_retouch_dir_times = preserve_times && !omit_dir_times; @@ -1292,19 +1302,19 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (protocol_version >= 29) { itemizing = 1; - maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT; + maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT; code = daemon_log_format_has_i ? 0 : FLOG; } else if (am_daemon) { itemizing = daemon_log_format_has_i && do_xfers; - maybe_PERMS_REPORT = PERMS_REPORT; + maybe_ATTRS_REPORT = ATTRS_REPORT; code = itemizing || !do_xfers ? FCLIENT : FINFO; } else if (!am_server) { itemizing = log_format_has_i; - maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT; + maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT; code = itemizing ? 0 : FINFO; } else { itemizing = 0; - maybe_PERMS_REPORT = PERMS_REPORT; + maybe_ATTRS_REPORT = ATTRS_REPORT; code = FINFO; } @@ -1341,8 +1351,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (local_name) strlcpy(fbuf, local_name, sizeof fbuf); else - f_name_to(file, fbuf); - recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT, + f_name(file, fbuf); + recv_generator(fbuf, file, i, itemizing, maybe_ATTRS_REPORT, code, f_out); /* We need to ensure that any dirs we create have writeable @@ -1351,7 +1361,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) #ifdef HAVE_CHMOD if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR) && !list_only) { - int mode = file->mode | S_IWUSR; /* user write */ + mode_t mode = file->mode | S_IWUSR; /* user write */ char *fname = local_name ? local_name : fbuf; if (do_chmod(fname, mode) < 0) { rsyserr(FERROR, errno, @@ -1372,7 +1382,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) } recv_generator(NULL, NULL, 0, 0, 0, code, -1); if (delete_during) - delete_in_dir(NULL, NULL, NULL); + delete_in_dir(NULL, NULL, NULL, NULL); phase++; csum_length = SUM_LENGTH; @@ -1395,8 +1405,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (local_name) strlcpy(fbuf, local_name, sizeof fbuf); else - f_name_to(file, fbuf); - recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT, + f_name(file, fbuf); + recv_generator(fbuf, file, i, itemizing, maybe_ATTRS_REPORT, code, f_out); } @@ -1438,12 +1448,13 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) * 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(f_name(file), file, i, itemizing, - maybe_PERMS_REPORT, code, -1); + recv_generator(f_name(file, NULL), file, i, itemizing, + maybe_ATTRS_REPORT, code, -1); if (allowed_lull && !(++j % lull_mod)) maybe_send_keepalive(); else if (!(j % 200))