X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d8b108c2a117318d58c6ef9e09d5741581df43e3..e7c67065c060d500eba8d073da9568db2c658aad:/generator.c diff --git a/generator.c b/generator.c index c66feaa8..26970cea 100644 --- a/generator.c +++ b/generator.c @@ -1,25 +1,25 @@ -/* -*- c-file-style: "linux" -*- - - rsync -- fast file replication program - - Copyright (C) 1996-2000 by Andrew Tridgell - Copyright (C) Paul Mackerras 1996 - Copyright (C) 2002 by Martin Pool - - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ +/* + * Routines that are exclusive to the generator process. + * + * Copyright (C) 1996-2000 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2002 Martin Pool + * Copyright (C) 2003, 2004, 2005, 2006 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ #include "rsync.h" @@ -27,7 +27,6 @@ extern int verbose; extern int dry_run; extern int do_xfers; extern int log_format_has_i; -extern int log_format_has_o_or_i; extern int daemon_log_format_has_i; extern int am_root; extern int am_server; @@ -35,15 +34,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; @@ -69,6 +71,7 @@ extern int ignore_timeout; extern int protocol_version; extern int fuzzy_basis; extern int always_checksum; +extern int checksum_len; extern char *partial_dir; extern char *basis_dir[]; extern int compare_dest; @@ -77,7 +80,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; @@ -93,6 +95,10 @@ extern struct filter_list_struct server_filter_list; static int deletion_count = 0; /* used to implement --max-delete */ +/* For calling delete_file() */ +#define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */ +#define DEL_TERSE (1<<3) + static int is_backup_file(char *fn) { @@ -102,8 +108,7 @@ static int is_backup_file(char *fn) /* Delete a file or directory. If DEL_FORCE_RECURSE is set in the flags, or if - * force_delete is set, this will delete recursively as long as DEL_NO_RECURSE - * is not set in the flags. + * force_delete is set, this will delete recursively. * * Note that fname must point to a MAXPATHLEN buffer if the mode indicates it's * a directory! (The buffer is used for recursion, but returned unchanged.) @@ -137,8 +142,7 @@ static int delete_item(char *fname, int mode, int flags) return -1; } - zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse)) - && !(flags & DEL_NO_RECURSE); + zap_dir = flags & DEL_FORCE_RECURSE || force_delete; if ((max_delete && ++deletion_count > max_delete) || (dry_run && zap_dir)) { ok = 0; @@ -212,14 +216,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) { @@ -231,7 +234,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(); @@ -256,13 +259,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; } @@ -275,9 +275,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); } } @@ -289,6 +288,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 */ @@ -301,19 +301,23 @@ 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"); } -static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) +int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) { if (preserve_perms && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) @@ -328,37 +332,33 @@ static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) return 1; } - void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, int32 iflags, uchar fnamecmp_type, char *xname) { - if (statret == 0) { + if (statret >= 0) { /* A from-dest-dir statret can == 1! */ + int keep_time = !preserve_times ? 0 + : S_ISDIR(file->mode) ? !omit_dir_times + : !S_ISLNK(file->mode); + if (S_ISREG(file->mode) && file->length != st->st_size) iflags |= ITEM_REPORT_SIZE; - if (!(iflags & ITEM_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_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time - && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) - || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0)) - iflags |= ITEM_REPORT_TIME; - if (preserve_perms - && (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; - if (preserve_gid && file->gid != GID_NONE - && st->st_gid != file->gid) - iflags |= ITEM_REPORT_GROUP; - } + if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time + && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) + || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0)) + iflags |= ITEM_REPORT_TIME; + 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; + if (preserve_gid && file->gid != GID_NONE + && st->st_gid != file->gid) + iflags |= ITEM_REPORT_GROUP; } else iflags |= ITEM_IS_NEW; 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); @@ -374,7 +374,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, /* 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) +int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) { if (st->st_size != file->length) return 0; @@ -384,8 +384,7 @@ static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) if (always_checksum && S_ISREG(st->st_mode)) { char sum[MD4_SUM_LENGTH]; file_checksum(fn, sum, st->st_size); - return memcmp(sum, file->u.sum, protocol_version < 21 ? 2 - : MD4_SUM_LENGTH) == 0; + return memcmp(sum, file->u.sum, checksum_len) == 0; } if (size_only) @@ -394,7 +393,7 @@ static 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; } @@ -554,7 +553,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", @@ -600,6 +599,175 @@ void check_for_finished_hlinks(int itemizing, enum logcode code) } } +/* This is only called for regular files. We return -2 if we've finished + * handling the file, -1 if no dest-linking occurred, or a non-negative + * 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_ATTRS_REPORT, enum logcode code) +{ + int best_match = -1; + int match_level = 0; + int j = 0; + + do { + pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); + if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode)) + continue; + switch (match_level) { + case 0: + best_match = j; + match_level = 1; + /* FALL THROUGH */ + case 1: + if (!unchanged_file(cmpbuf, file, stp)) + continue; + best_match = j; + match_level = 2; + /* FALL THROUGH */ + case 2: + if (!unchanged_attrs(file, stp)) + continue; + if ((always_checksum || ignore_times) + && cmp_time(stp->st_mtime, file->modtime)) + continue; + best_match = j; + match_level = 3; + break; + } + break; + } while (basis_dir[++j] != NULL); + + if (!match_level) + return -1; + + if (j != best_match) { + j = best_match; + pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); + if (link_stat(cmpbuf, stp, 0) < 0) + match_level = 0; + } + +#ifdef HAVE_LINK + if (match_level == 3 && !copy_dest) { + if (link_dest) { + if (hard_link_one(file, ndx, fname, 0, stp, + cmpbuf, 1, + itemizing && verbose > 1, + code) < 0) + goto try_a_copy; + if (preserve_hard_links && file->link_u.links) + hard_link_cluster(file, ndx, itemizing, code); + } else if (itemizing) + itemize(file, ndx, 0, stp, 0, 0, NULL); + if (verbose > 1 && maybe_ATTRS_REPORT) { + code = daemon_log_format_has_i || dry_run + ? FCLIENT : FINFO; + rprintf(code, "%s is uptodate\n", fname); + } + return -2; + } +#endif + + if (match_level >= 2) { + try_a_copy: /* Copy the file locally. */ + if (copy_file(cmpbuf, fname, file->mode) < 0) { + if (verbose) { + rsyserr(FINFO, errno, "copy_file %s => %s", + full_fname(cmpbuf), fname); + } + return -1; + } + if (itemizing) + itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL); + 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", fname, + match_level == 3 ? " is uptodate" : ""); + } + if (preserve_hard_links && file->link_u.links) + hard_link_cluster(file, ndx, itemizing, code); + return -2; + } + + return FNAMECMP_BASIS_DIR_LOW + j; +} + +/* This is only called for non-regular files. We return -2 if we've finished + * 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 maybe_ATTRS_REPORT, + enum logcode code) +{ + char fnamebuf[MAXPATHLEN]; + STRUCT_STAT st; + int i = 0; + + do { + pathjoin(fnamebuf, MAXPATHLEN, basis_dir[i], fname); + if (link_stat(fnamebuf, &st, 0) < 0 || S_ISDIR(st.st_mode) + || !unchanged_attrs(file, &st)) + continue; + if (S_ISLNK(file->mode)) { +#ifdef SUPPORT_LINKS + char lnk[MAXPATHLEN]; + int len; + if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0) + continue; + lnk[len] = '\0'; + if (strcmp(lnk, file->u.link) != 0) +#endif + continue; + } else if (IS_SPECIAL(file->mode)) { + if (!IS_SPECIAL(st.st_mode) || st.st_rdev != file->u.rdev) + continue; + } else if (IS_DEVICE(file->mode)) { + if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev) + continue; + } else { + rprintf(FERROR, + "internal: try_dests_non() called with invalid mode (%o)\n", + file->mode); + exit_cleanup(RERR_UNSUPPORTED); + } + if (link_dest +#ifndef CAN_HARDLINK_SYMLINK + && !S_ISLNK(file->mode) +#endif +#ifndef CAN_HARDLINK_SPECIAL + && !IS_SPECIAL(file->mode) && !IS_DEVICE(file->mode) +#endif + ) { + if (do_link(fnamebuf, fname) < 0) { + rsyserr(FERROR, errno, + "failed to hard-link %s with %s", + fnamebuf, fname); + break; + } + if (preserve_hard_links && file->link_u.links) + hard_link_cluster(file, ndx, itemizing, code); + } + if (itemizing && log_format_has_i && verbose > 1) { + int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE + + (link_dest ? ITEM_XNAME_FOLLOWS : 0); + char *lp = link_dest ? "" : NULL; + itemize(file, ndx, 0, &st, changes, 0, lp); + } + if (verbose > 1 && maybe_ATTRS_REPORT) { + code = daemon_log_format_has_i || dry_run + ? FCLIENT : FINFO; + rprintf(code, "%s is uptodate\n", fname); + } + return -2; + } while (basis_dir[++i] != NULL); + + return -1; +} + static int phase = 0; /* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir, @@ -613,12 +781,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; @@ -627,6 +796,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; @@ -635,19 +805,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) { @@ -659,11 +827,11 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, S_ISDIR(file->mode)) < 0) { if (S_ISDIR(file->mode)) excluded_below = file->dir.depth; - skipping: + skipping: if (verbose) { rprintf(FINFO, "skipping server-excluded file \"%s\"\n", - safe_fname(fname)); + fname); } return; } @@ -677,15 +845,27 @@ 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 + && do_stat(dn, &st) < 0 + && create_directory_path(fname) < 0) { + rsyserr(FERROR, errno, + "recv_generator: mkdir %s failed", + full_fname(dn)); + } + if (fuzzy_dirlist) { + flist_free(fuzzy_dirlist); + fuzzy_dirlist = NULL; } - fuzzy_dirname = dn; + 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, @@ -697,18 +877,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)) { @@ -718,7 +897,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; } @@ -732,19 +911,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; } @@ -758,11 +937,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; } @@ -781,8 +959,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, @@ -794,10 +972,22 @@ 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) { + if (try_dests_non(file, fname, ndx, itemizing, + maybe_ATTRS_REPORT, code) == -2) { +#ifndef CAN_HARDLINK_SYMLINK + if (link_dest) { + /* Resort to --copy-dest behavior. */ + } else +#endif + if (!copy_dest) + return; + itemizing = code = 0; + } } if (preserve_hard_links && file->link_u.links && hard_link_check(file, ndx, fname, -1, &st, @@ -805,16 +995,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]; @@ -828,37 +1018,50 @@ 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) { + if (try_dests_non(file, fname, ndx, itemizing, + maybe_ATTRS_REPORT, code) == -2) { +#ifndef CAN_HARDLINK_SPECIAL + if (link_dest) { + /* Resort to --copy-dest behavior. */ + } else +#endif + if (!copy_dest) + return; + itemizing = code = 0; + } + } if (statret != 0 || (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); @@ -867,7 +1070,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); } @@ -876,41 +1079,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; } @@ -918,107 +1118,21 @@ 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; } if (statret != 0 && basis_dir[0] != NULL) { - int best_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)) - continue; - switch (match_level) { - case 0: - best_match = i; - match_level = 1; - /* FALL THROUGH */ - case 1: - if (!unchanged_file(fnamecmpbuf, file, &st)) - continue; - best_match = i; - match_level = 2; - if (copy_dest) - break; - /* FALL THROUGH */ - case 2: - if (!unchanged_attrs(file, &st)) - continue; - best_match = i; - match_level = 3; - break; - } - break; - } while (basis_dir[++i] != NULL); - if (match_level) { + int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st, + itemizing, maybe_ATTRS_REPORT, code); + if (j == -2) + return; + if (j != -1) { + fnamecmp = fnamecmpbuf; + fnamecmp_type = j; statret = 0; - if (i != best_match) { - i = best_match; - pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, - basis_dir[i], fname); - if (link_stat(fnamecmpbuf, &st, 0) < 0) { - match_level = 0; - statret = -1; - stat_errno = errno; - } - } -#ifdef HAVE_LINK - if (link_dest && match_level == 3) { - if (hard_link_one(file, ndx, fname, -1, &st, - fnamecmpbuf, 1, - itemizing && verbose > 1, - code) == 0) { - if (preserve_hard_links - && file->link_u.links) { - hard_link_cluster(file, ndx, - itemizing, - code); - } - return; - } - match_level = 2; - } -#endif - if (match_level == 2) { - /* Copy the file locally. */ - if (copy_file(fnamecmpbuf, fname, file->mode) < 0) { - if (verbose) { - rsyserr(FINFO, errno, - "copy_file %s => %s", - full_fname(fnamecmpbuf), - safe_fname(fname)); - } - match_level = 0; - statret = -1; - } else { - if (itemizing) { - itemize(file, ndx, 0, &st, - ITEM_LOCAL_CHANGE, 0, - NULL); - } else if (verbose && code) { - rprintf(code, "%s\n", - safe_fname(fname)); - } - set_perms(fname, file, NULL, - maybe_PERMS_REPORT); - if (preserve_hard_links - && file->link_u.links) { - hard_link_cluster(file, ndx, - itemizing, - code); - } - return; - } - } else if (compare_dest || match_level == 1) { - fnamecmp = fnamecmpbuf; - fnamecmp_type = i; - } } } @@ -1033,14 +1147,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; @@ -1064,7 +1178,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (append_mode && st.st_size > file->length) return; - if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) + if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) ; else if (fnamecmp_type == FNAMECMP_FUZZY) ; @@ -1073,23 +1187,17 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, do_unlink(partialptr); handle_partial_dir(partialptr, PDIR_DELETE); } - if (fnamecmp_type == FNAMECMP_FNAME) { - if (itemizing) { - itemize(file, ndx, real_ret, &real_st, - 0, 0, NULL); - } - set_perms(fname, file, &st, maybe_PERMS_REPORT); - if (preserve_hard_links && file->link_u.links) - hard_link_cluster(file, ndx, itemizing, code); - return; + if (itemizing) { + itemize(file, ndx, real_ret, &real_st, + 0, 0, NULL); } - /* Only --compare-dest gets here. */ - itemize(file, ndx, real_ret, &real_st, - ITEM_NO_DEST_AND_NO_UPDATE, 0, NULL); + 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; } -prepare_to_open: + prepare_to_open: if (partialptr) { st = partial_st; fnamecmp = partialptr; @@ -1100,7 +1208,7 @@ prepare_to_open: 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; @@ -1112,7 +1220,7 @@ prepare_to_open: if (fd == -1) { rsyserr(FERROR, errno, "failed to open %s, continuing", full_fname(fnamecmp)); - pretend_missing: + pretend_missing: /* pretend the file didn't exist */ if (preserve_hard_links && file->link_u.links && hard_link_check(file, ndx, fname, statret, &st, @@ -1127,7 +1235,7 @@ prepare_to_open: 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; } @@ -1151,13 +1259,15 @@ prepare_to_open: 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: + 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; @@ -1188,10 +1298,10 @@ notify_others: 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); } @@ -1199,12 +1309,11 @@ notify_others: 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; @@ -1213,22 +1322,23 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) int save_ignore_non_existing = ignore_non_existing; int save_do_progress = do_progress; int save_make_backups = make_backups; + int dir_tweaking = !(list_only || local_name || dry_run); 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; } @@ -1265,8 +1375,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 @@ -1274,8 +1384,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) * them. This is then fixed after the transfer is done. */ #ifdef HAVE_CHMOD if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR) - && !list_only) { - int mode = file->mode | S_IWUSR; /* user write */ + && dir_tweaking) { + 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, @@ -1296,7 +1406,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; @@ -1319,8 +1429,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); } @@ -1354,20 +1464,20 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (delete_after && !local_name && flist->count > 0) do_delete_pass(flist); - if ((need_retouch_dir_perms || need_retouch_dir_times) - && !list_only && !local_name && !dry_run) { + if ((need_retouch_dir_perms || need_retouch_dir_times) && dir_tweaking) { int j = 0; /* 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(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))