X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e912bd4dfbd9cfa83f7b76209b3fcb34f59b92f9..06982ac43bda6892b92e5b67895a939e24dbc40f:/generator.c diff --git a/generator.c b/generator.c index e444defa..b6abc2c0 100644 --- a/generator.c +++ b/generator.c @@ -35,6 +35,7 @@ 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; @@ -45,6 +46,7 @@ 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; @@ -144,7 +146,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; @@ -346,10 +348,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; @@ -396,7 +397,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; } @@ -556,7 +557,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", @@ -632,7 +633,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; @@ -770,8 +771,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, 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 struct file_list *need_dirlist = (struct file_list *)""; struct file_struct *fuzzy_file = NULL; int fd = -1, f_copy = -1; STRUCT_STAT st, real_st, partial_st; @@ -780,20 +782,22 @@ 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; if (!fname) { if (fuzzy_dirlist) { - flist_free(fuzzy_dirlist); + if (fuzzy_dirlist != need_dirlist) + flist_free(fuzzy_dirlist); fuzzy_dirlist = NULL; - fuzzy_dirname = ""; } if (missing_below >= 0) { dry_run--; missing_below = -1; } + parent_dirname = ""; return; } @@ -828,16 +832,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) + 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, orig_umask) < 0) { + rsyserr(FERROR, errno, + "recv_generator: mkdir %s failed", + full_fname(dn)); + } + if (fuzzy_dirlist) { + if (fuzzy_dirlist != need_dirlist) flist_free(fuzzy_dirlist); - fuzzy_dirlist = get_dirlist(dn, -1, 1); + fuzzy_dirlist = NULL; } - fuzzy_dirname = dn; + if (fuzzy_basis) + fuzzy_dirlist = need_dirlist; } + parent_dirname = dn; + + if (fuzzy_dirlist == need_dirlist && S_ISREG(file->mode)) + fuzzy_dirlist = get_dirlist(dn, -1, 1); statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode)); @@ -853,13 +867,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, 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)) { @@ -869,7 +882,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; } @@ -944,7 +957,7 @@ 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; @@ -1002,7 +1015,7 @@ 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, @@ -1073,7 +1086,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } 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", fname); return; @@ -1083,7 +1096,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; @@ -1112,7 +1125,7 @@ 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]; @@ -1173,7 +1186,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; @@ -1231,6 +1244,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, 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;