X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9b25ef35bd8c13480f79753c605f873d9e271936..b769ad6a3e7ef871ea0aabd5b033018ba6cdbb90:/generator.c diff --git a/generator.c b/generator.c index bbc6923f..a0bf08ee 100644 --- a/generator.c +++ b/generator.c @@ -7,8 +7,9 @@ * Copyright (C) 2003-2007 Wayne Davison * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 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 @@ -16,8 +17,7 @@ * 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. + * with this program; if not, visit the http://fsf.org website. */ #include "rsync.h" @@ -43,7 +43,6 @@ extern int preserve_specials; extern int preserve_hard_links; extern int preserve_perms; extern int preserve_times; -extern int omit_dir_times; extern int uid_ndx; extern int gid_ndx; extern int delete_mode; @@ -82,10 +81,10 @@ extern int copy_dest; extern int link_dest; extern int whole_file; extern int list_only; -extern int new_root_dir; extern int read_batch; extern int safe_symlinks; extern long block_size; /* "long" because popt can't set an int32. */ +extern int unsort_ndx; extern int max_delete; extern int force_delete; extern int one_file_system; @@ -97,9 +96,6 @@ extern char *backup_suffix; extern int backup_suffix_len; extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct filter_list_struct server_filter_list; -#ifdef ICONV_OPTION -extern int ic_ndx; -#endif int ignore_perishable = 0; int non_perishable_cnt = 0; @@ -113,6 +109,7 @@ static int deldelay_fd = -1; static int lull_mod; static int dir_tweaking; static int need_retouch_dir_times; +static int need_retouch_dir_perms; static const char *solo_file = NULL; /* For calling delete_item() and delete_dir_contents(). */ @@ -199,7 +196,7 @@ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) check_ret: if (replace && ret != DR_SUCCESS) { - rprintf(FERROR, "could not make way for new %s: %s\n", + rprintf(FERROR_XFER, "could not make way for new %s: %s\n", replace, fbuf); } return ret; @@ -231,7 +228,7 @@ static enum delret delete_dir_contents(char *fname, int flags) dirlist = get_dirlist(fname, dlen, 0); ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS; - if (!dirlist->count) + if (!dirlist->used) goto done; if (!(flags & DEL_RECURSE)) { @@ -247,7 +244,7 @@ static enum delret delete_dir_contents(char *fname, int flags) /* We do our own recursion, so make delete_item() non-recursive. */ flags = (flags & ~DEL_RECURSE) | DEL_DIR_IS_EMPTY; - for (j = dirlist->count; j--; ) { + for (j = dirlist->used; j--; ) { struct file_struct *fp = dirlist->files[j]; if (fp->flags & FLAG_MOUNT_DIR) { @@ -318,7 +315,7 @@ static int flush_delete_delay(void) static int remember_delete(struct file_struct *file, const char *fname) { int len; - + while (1) { len = snprintf(deldelay_buf + deldelay_cnt, deldelay_size - deldelay_cnt, @@ -459,7 +456,7 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) /* If an item in dirlist is not found in flist, delete it * from the filesystem. */ - for (i = dirlist->count; i--; ) { + for (i = dirlist->used; i--; ) { struct file_struct *fp = dirlist->files[i]; if (!F_IS_ACTIVE(fp)) continue; @@ -494,10 +491,10 @@ static void do_delete_pass(void) if (dry_run > 1 || list_only) return; - for (j = 0; j < cur_flist->count; j++) { + for (j = 0; j < cur_flist->used; j++) { struct file_struct *file = cur_flist->sorted[j]; - if (!(file->flags & FLAG_XFER_DIR)) + if (!(file->flags & FLAG_CONTENT_DIR)) continue; f_name(file, fbuf); @@ -516,8 +513,16 @@ static void do_delete_pass(void) rprintf(FINFO, " \r"); } -int unchanged_attrs(const char *fname, struct file_struct *file, statx *sxp) +int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp) { +#ifndef HAVE_LUTIMES + if (S_ISLNK(file->mode)) { + ; + } else +#endif + if (preserve_times && cmp_time(sxp->st.st_mtime, file->modtime) != 0) + return 0; + if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) return 0; @@ -548,12 +553,12 @@ int unchanged_attrs(const char *fname, struct file_struct *file, statx *sxp) } void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statret, - statx *sxp, int32 iflags, uchar fnamecmp_type, + stat_x *sxp, int32 iflags, uchar fnamecmp_type, const char *xname) { if (statret >= 0) { /* A from-dest-dir statret can == 1! */ int keep_time = !preserve_times ? 0 - : S_ISDIR(file->mode) ? !omit_dir_times + : S_ISDIR(file->mode) ? preserve_times > 1 : !S_ISLNK(file->mode); if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size) @@ -563,6 +568,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0)) iflags |= ITEM_REPORT_TIME; +#if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST + if (S_ISLNK(file->mode)) { + ; + } else +#endif if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) iflags |= ITEM_REPORT_PERMS; if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid) @@ -784,7 +794,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) fname_len = strlen(fname); fname_suf = find_filename_suffix(fname, fname_len, &fname_suf_len); - for (j = 0; j < dirlist->count; j++) { + for (j = 0; j < dirlist->used; j++) { struct file_struct *fp = dirlist->files[j]; const char *suf, *name; int len, suf_len; @@ -826,11 +836,45 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) return lowest_j; } +/* Copy a file found in our --copy-dest handling. */ +static int copy_altdest_file(const char *src, const char *dest, struct file_struct *file) +{ + char buf[MAXPATHLEN]; + const char *copy_to, *partialptr; + int ok, fd_w; + + if (inplace) { + /* Let copy_file open the destination in place. */ + fd_w = -1; + copy_to = dest; + } else { + fd_w = open_tmpfile(buf, dest, file); + if (fd_w < 0) + return -1; + copy_to = buf; + } + cleanup_set(copy_to, NULL, NULL, -1, -1); + if (copy_file(src, copy_to, fd_w, file->mode, 0) < 0) { + if (verbose) { + rsyserr(FINFO, errno, "copy_file %s => %s", + full_fname(src), copy_to); + } + /* Try to clean up. */ + unlink(copy_to); + cleanup_disable(); + return -1; + } + partialptr = partial_dir ? partial_dir_fname(dest) : NULL; + ok = finish_transfer(dest, copy_to, src, partialptr, file, 1, 0); + cleanup_disable(); + return ok ? 0 : -1; +} + /* 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, statx *sxp, int itemizing, + char *cmpbuf, stat_x *sxp, int itemizing, enum logcode code) { int best_match = -1; @@ -855,9 +899,6 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, case 2: if (!unchanged_attrs(cmpbuf, file, sxp)) continue; - if (always_checksum > 0 && preserve_times - && cmp_time(sxp->st.st_mtime, file->modtime)) - continue; best_match = j; match_level = 3; break; @@ -881,7 +922,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, if (!hard_link_one(file, fname, cmpbuf, 1)) goto try_a_copy; if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sxp->st, itemizing, code, j); + finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j); if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) { itemize(cmpbuf, file, ndx, 1, sxp, ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, @@ -900,20 +941,10 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, #ifdef SUPPORT_HARD_LINKS try_a_copy: /* Copy the file locally. */ #endif - if (copy_file(cmpbuf, fname, file->mode) < 0) { - if (verbose) { - rsyserr(FINFO, errno, "copy_file %s => %s", - full_fname(cmpbuf), fname); - } + if (!dry_run && copy_altdest_file(cmpbuf, fname, file) < 0) return -1; - } - set_file_attrs(fname, file, NULL, cmpbuf, 0); if (itemizing) itemize(cmpbuf, file, ndx, 0, sxp, ITEM_LOCAL_CHANGE, 0, NULL); -#ifdef SUPPORT_XATTRS - if (preserve_xattrs) - xattr_clear_locals(file); -#endif if (maybe_ATTRS_REPORT && ((!itemizing && verbose && match_level == 2) || (verbose > 1 && match_level == 3))) { @@ -923,7 +954,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, } #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sxp->st, itemizing, code, -1); + finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, -1); #endif return -2; } @@ -935,7 +966,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, * handling the file, or -1 if no dest-linking occurred, or a non-negative * value if we found an alternate basis file. */ static int try_dests_non(struct file_struct *file, char *fname, int ndx, - char *cmpbuf, statx *sxp, int itemizing, + char *cmpbuf, stat_x *sxp, int itemizing, enum logcode code) { char lnk[MAXPATHLEN]; @@ -1045,13 +1076,13 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, #endif && !S_ISDIR(file->mode)) { if (do_link(cmpbuf, fname) < 0) { - rsyserr(FERROR, errno, + rsyserr(FERROR_XFER, errno, "failed to hard-link %s with %s", cmpbuf, fname); return j; } if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, NULL, itemizing, code, -1); + finish_hard_link(file, fname, ndx, NULL, itemizing, code, -1); } else #endif match_level = 2; @@ -1073,6 +1104,35 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, return j; } +static void list_file_entry(struct file_struct *f) +{ + char permbuf[PERMSTRING_SIZE]; + double len; + + if (!F_IS_ACTIVE(f)) { + /* this can happen if duplicate names were removed */ + return; + } + + permstring(permbuf, f->mode); + len = F_LENGTH(f); + + /* TODO: indicate '+' if the entry has an ACL. */ + +#ifdef SUPPORT_LINKS + if (preserve_links && S_ISLNK(f->mode)) { + rprintf(FINFO, "%s %11.0f %s %s -> %s\n", + permbuf, len, timestring(f->modtime), + f_name(f, NULL), F_SYMLINK(f)); + } else +#endif + { + rprintf(FINFO, "%s %11.0f %s %s\n", + permbuf, len, timestring(f->modtime), + f_name(f, NULL)); + } +} + static int phase = 0; static int dflt_perms; @@ -1091,35 +1151,46 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, { static int missing_below = -1, excluded_below = -1; static const char *parent_dirname = ""; + static struct file_struct *missing_dir = NULL, *excluded_dir = NULL; 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; - statx sx, real_sx; + stat_x sx, real_sx; STRUCT_STAT partial_st; struct file_struct *back_file = NULL; int statret, real_ret, stat_errno; char *fnamecmp, *partialptr, *backupptr = NULL; char fnamecmpbuf[MAXPATHLEN]; uchar fnamecmp_type; + int implied_dirs_are_missing = relative_paths && !implied_dirs && protocol_version < 30; int del_opts = delete_mode || force_delete ? DEL_RECURSE : 0; - if (list_only) - return; - if (verbose > 2) rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx); + if (list_only) { + if (S_ISDIR(file->mode) + && ((!implied_dirs && file->flags & FLAG_IMPLIED_DIR) + || (inc_recurse && ndx != cur_flist->ndx_start - 1))) + return; + list_file_entry(file); + return; + } + if (server_filter_list.head) { if (excluded_below >= 0) { - if (F_DEPTH(file) > excluded_below) + if (F_DEPTH(file) > excluded_below + && (!implied_dirs_are_missing || f_name_has_prefix(file, excluded_dir))) goto skipping; excluded_below = -1; } if (check_filter(&server_filter_list, fname, S_ISDIR(file->mode)) < 0) { - if (S_ISDIR(file->mode)) + if (S_ISDIR(file->mode)) { excluded_below = F_DEPTH(file); + excluded_dir = file; + } skipping: if (verbose) { rprintf(FINFO, @@ -1131,7 +1202,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (missing_below >= 0) { - if (F_DEPTH(file) <= missing_below) { + if (F_DEPTH(file) <= missing_below + || (implied_dirs_are_missing && !f_name_has_prefix(file, missing_dir))) { if (dry_run) dry_run--; missing_below = -1; @@ -1161,7 +1233,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (relative_paths && !implied_dirs && do_stat(dn, &sx.st) < 0 && create_directory_path(fname) < 0) { - rsyserr(FERROR, errno, + rsyserr(FERROR_XFER, errno, "recv_generator: mkdir %s failed", full_fname(dn)); } @@ -1200,6 +1272,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (dry_run) dry_run++; missing_below = F_DEPTH(file); + missing_dir = file; } file->flags |= FLAG_MISSING_DIR; } @@ -1207,6 +1280,22 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (S_ISDIR(file->mode)) { + if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR) + goto cleanup; + if (inc_recurse && ndx != cur_flist->ndx_start - 1) { + /* In inc_recurse mode we want to make sure any missing + * directories get created while we're still processing + * the parent dir (which allows us to touch the parent + * dir's mtime right away). We will handle the dir in + * full later (right before we handle its contents). */ + if (statret == 0 + && (S_ISDIR(sx.st.st_mode) + || delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0)) + goto cleanup; /* Any errors get reported later. */ + if (do_mkdir(fname, file->mode & 0700) == 0) + file->flags |= FLAG_DIR_CREATED; + goto cleanup; + } /* The file to be received is a directory, so we need * to prepare appropriately. If there is already a * file of that name and it is *not* a directory, then @@ -1214,20 +1303,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, * (perhaps recursively) create it. */ if (statret == 0 && !S_ISDIR(sx.st.st_mode)) { if (delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0) - return; + goto skipping_dir_contents; statret = -1; } if (dry_run && statret != 0 && missing_below < 0) { missing_below = F_DEPTH(file); + missing_dir = file; dry_run++; } real_ret = statret; real_sx = sx; - if (new_root_dir) { - if (*fname == '.' && fname[1] == '\0') - statret = -1; - new_root_dir = 0; - } + if (file->flags & FLAG_DIR_CREATED) + statret = -1; if (!preserve_perms) { /* See comment in non-dir code below. */ file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms, statret == 0); @@ -1249,12 +1336,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (!relative_paths || errno != ENOENT || create_directory_path(fname) < 0 || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) { - rsyserr(FERROR, errno, + rsyserr(FERROR_XFER, errno, "recv_generator: mkdir %s failed", full_fname(fname)); + skipping_dir_contents: rprintf(FERROR, "*** Skipping any contents from this failed directory ***\n"); missing_below = F_DEPTH(file); + missing_dir = file; file->flags |= FLAG_MISSING_DIR; goto cleanup; } @@ -1262,17 +1351,33 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0) && verbose && code != FNONE && f_out != -1) rprintf(code, "%s/\n", fname); + + /* We need to ensure that the dirs in the transfer have writable + * permissions during the time we are putting files within them. + * This is then fixed after the transfer is done. */ +#ifdef HAVE_CHMOD + if (!am_root && !(file->mode & S_IWUSR) && dir_tweaking) { + mode_t mode = file->mode | S_IWUSR; + if (do_chmod(fname, mode) < 0) { + rsyserr(FERROR_XFER, errno, + "failed to modify permissions on %s", + full_fname(fname)); + } + need_retouch_dir_perms = 1; + } +#endif + if (real_ret != 0 && one_file_system) real_sx.st.st_dev = filesystem_dev; if (inc_recurse) { if (one_file_system) { - uint32 *devp = F_DIRDEV_P(file); + uint32 *devp = F_DIR_DEV_P(file); DEV_MAJOR(devp) = major(real_sx.st.st_dev); DEV_MINOR(devp) = minor(real_sx.st.st_dev); } } else if (delete_during && f_out != -1 && !phase && dry_run < 2 - && (file->flags & FLAG_XFER_DIR)) + && (file->flags & FLAG_CONTENT_DIR)) delete_in_dir(fname, file, &real_sx.st.st_dev); goto cleanup; } @@ -1316,9 +1421,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT); if (itemizing) itemize(fname, file, ndx, 0, &sx, 0, 0, NULL); -#ifdef SUPPORT_HARD_LINKS +#if defined SUPPORT_HARD_LINKS && defined CAN_HARDLINK_SYMLINK if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sx.st, itemizing, code, -1); + finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1); #endif if (remove_source_files == 1) goto return_with_success; @@ -1345,11 +1450,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, statret = 1; } #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && F_HLINK_NOT_LAST(file)) + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) { + cur_flist->in_progress++; goto cleanup; + } #endif if (do_symlink(sl, fname) != 0) { - rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed", + rsyserr(FERROR_XFER, errno, "symlink %s -> \"%s\" failed", full_fname(fname), sl); } else { set_file_attrs(fname, file, NULL, NULL, 0); @@ -1361,7 +1468,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, rprintf(code, "%s -> %s\n", fname, sl); #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, NULL, itemizing, code, -1); + finish_hard_link(file, fname, ndx, NULL, itemizing, code, -1); #endif /* This does not check remove_source_files == 1 * because this is one of the items that the old @@ -1397,7 +1504,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, itemize(fname, file, ndx, 0, &sx, 0, 0, NULL); #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sx.st, itemizing, code, -1); + finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1); #endif if (remove_source_files == 1) goto return_with_success; @@ -1422,8 +1529,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, statret = 1; } #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && F_HLINK_NOT_LAST(file)) + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) { + cur_flist->in_progress++; goto cleanup; + } #endif if (verbose > 2) { rprintf(FINFO, "mknod(%s, 0%o, [%ld,%ld])\n", @@ -1431,7 +1540,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, (long)major(rdev), (long)minor(rdev)); } if (do_mknod(fname, file->mode, rdev) < 0) { - rsyserr(FERROR, errno, "mknod %s failed", + rsyserr(FERROR_XFER, errno, "mknod %s failed", full_fname(fname)); } else { set_file_attrs(fname, file, NULL, NULL, 0); @@ -1443,7 +1552,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, rprintf(code, "%s\n", fname); #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, NULL, itemizing, code, -1); + finish_hard_link(file, fname, ndx, NULL, itemizing, code, -1); #endif if (remove_source_files == 1) goto return_with_success; @@ -1542,17 +1651,19 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (statret != 0) { #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && F_HLINK_NOT_LAST(file)) + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) { + cur_flist->in_progress++; goto cleanup; + } #endif if (stat_errno == ENOENT) goto notify_others; - rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s", + rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s", full_fname(fname)); goto cleanup; } - if (append_mode > 0 && sx.st.st_size > F_LENGTH(file)) + if (append_mode > 0 && sx.st.st_size >= F_LENGTH(file)) goto cleanup; if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) @@ -1569,7 +1680,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL); #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sx.st, itemizing, code, -1); + finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1); #endif if (remove_source_files != 1) goto cleanup; @@ -1587,9 +1698,24 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, statret = 0; } - if (!do_xfers || read_batch || whole_file) + if (!do_xfers) goto notify_others; + if (read_batch || whole_file) { + if (inplace && make_backups > 0 && fnamecmp_type == FNAMECMP_FNAME) { + if (!(backupptr = get_backup_name(fname))) + goto cleanup; + if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) + goto pretend_missing; + if (copy_file(fname, backupptr, -1, back_file->mode, 1) < 0) { + unmake_file(back_file); + back_file = NULL; + goto cleanup; + } + } + goto notify_others; + } + if (fuzzy_dirlist) { int j = flist_find(fuzzy_dirlist, file); if (j >= 0) /* don't use changing file as future fuzzy basis */ @@ -1597,16 +1723,16 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } /* open the file */ - fd = do_open(fnamecmp, O_RDONLY, 0); - - if (fd == -1) { + if ((fd = do_open(fnamecmp, O_RDONLY, 0)) < 0) { rsyserr(FERROR, errno, "failed to open %s, continuing", full_fname(fnamecmp)); pretend_missing: /* pretend the file didn't exist */ #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && F_HLINK_NOT_LAST(file)) + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) { + cur_flist->in_progress++; goto cleanup; + } #endif statret = real_ret = -1; goto notify_others; @@ -1622,17 +1748,20 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, goto pretend_missing; } if (robust_unlink(backupptr) && errno != ENOENT) { - rsyserr(FERROR, errno, "unlink %s", + rsyserr(FERROR_XFER, errno, "unlink %s", full_fname(backupptr)); unmake_file(back_file); + back_file = NULL; close(fd); goto cleanup; } - if ((f_copy = do_open(backupptr, - O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) { - rsyserr(FERROR, errno, "open %s", + if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0 + && (errno != ENOENT || make_bak_dir(backupptr) < 0 + || (f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0)) { + rsyserr(FERROR_XFER, errno, "open %s", full_fname(backupptr)); unmake_file(back_file); + back_file = NULL; close(fd); goto cleanup; } @@ -1680,22 +1809,24 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (!do_xfers) { #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sx.st, itemizing, code, -1); + finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1); #endif goto cleanup; } if (read_batch) goto cleanup; - if (statret != 0 || whole_file) { + if (statret != 0 || whole_file) write_sum_head(f_out, NULL); - goto cleanup; + else { + generate_and_send_sums(fd, sx.st.st_size, f_out, f_copy); + close(fd); } - generate_and_send_sums(fd, sx.st.st_size, f_out, f_copy); - - if (f_copy >= 0) { - close(f_copy); + cleanup: + if (back_file) { + if (f_copy >= 0) + close(f_copy); set_file_attrs(backupptr, back_file, NULL, NULL, 0); if (verbose > 1) { rprintf(FINFO, "backed up %s to %s\n", @@ -1704,9 +1835,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, unmake_file(back_file); } - close(fd); - - cleanup: #ifdef SUPPORT_ACLS if (preserve_acls) free_acl(&sx); @@ -1727,7 +1855,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx) if (ndx < 0) { start = 0; - end = flist->count - 1; + end = flist->used - 1; } else start = end = ndx; @@ -1735,15 +1863,16 @@ static void touch_up_dirs(struct file_list *flist, int ndx) * transfer and/or re-set any tweaked modified-time values. */ for (i = start; i <= end; i++, counter++) { file = flist->files[i]; + if (!S_ISDIR(file->mode) + || (!implied_dirs && file->flags & FLAG_IMPLIED_DIR)) + continue; if (verbose > 3) { fname = f_name(file, NULL); rprintf(FINFO, "touch_up_dirs: %s (%d)\n", NS(fname), i); } - if (!F_IS_ACTIVE(file) || !S_ISDIR(file->mode) - || file->flags & FLAG_MISSING_DIR) - continue; - if (!need_retouch_dir_times && file->mode & S_IWUSR) + if (!F_IS_ACTIVE(file) || file->flags & FLAG_MISSING_DIR + || (!need_retouch_dir_times && file->mode & S_IWUSR)) continue; fname = f_name(file, NULL); if (!(file->mode & S_IWUSR)) @@ -1764,56 +1893,63 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo) char fbuf[MAXPATHLEN]; int ndx; + while (1) { #ifdef SUPPORT_HARD_LINKS - while (preserve_hard_links && (ndx = get_hlink_num()) != -1) { - flist = flist_for_ndx(ndx); - assert(flist != NULL); - file = flist->files[ndx]; - assert(file->flags & FLAG_HLINKED); - finish_hard_link(file, f_name(file, fbuf), NULL, itemizing, code, -1); - } + if (preserve_hard_links && (ndx = get_hlink_num()) != -1) { + flist = flist_for_ndx(ndx); + assert(flist != NULL); + file = flist->files[ndx - flist->ndx_start]; + assert(file->flags & FLAG_HLINKED); + finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1); + flist->in_progress--; + continue; + } #endif - while (check_redo && (ndx = get_redo_num()) != -1) { - csum_length = SUM_LENGTH; - max_size = -max_size; - min_size = -min_size; - ignore_existing = -ignore_existing; - ignore_non_existing = -ignore_non_existing; - update_only = -update_only; - always_checksum = -always_checksum; - size_only = -size_only; - append_mode = -append_mode; - make_backups = -make_backups; /* avoid dup backup w/inplace */ - ignore_times++; - - flist = cur_flist; - cur_flist = flist_for_ndx(ndx); - - file = cur_flist->files[ndx - cur_flist->ndx_start]; - if (solo_file) - strlcpy(fbuf, solo_file, sizeof fbuf); - else - f_name(file, fbuf); - recv_generator(fbuf, file, ndx, itemizing, code, sock_f_out); - cur_flist->to_redo--; - - cur_flist = flist; - - csum_length = SHORT_SUM_LENGTH; - max_size = -max_size; - min_size = -min_size; - ignore_existing = -ignore_existing; - ignore_non_existing = -ignore_non_existing; - update_only = -update_only; - always_checksum = -always_checksum; - size_only = -size_only; - append_mode = -append_mode; - make_backups = -make_backups; - ignore_times--; - } - - while (cur_flist != first_flist) { /* only possible with inc_recurse */ + if (check_redo && (ndx = get_redo_num()) != -1) { + csum_length = SUM_LENGTH; + max_size = -max_size; + min_size = -min_size; + ignore_existing = -ignore_existing; + ignore_non_existing = -ignore_non_existing; + update_only = -update_only; + always_checksum = -always_checksum; + size_only = -size_only; + append_mode = -append_mode; + make_backups = -make_backups; /* avoid dup backup w/inplace */ + ignore_times++; + + flist = cur_flist; + cur_flist = flist_for_ndx(ndx); + + file = cur_flist->files[ndx - cur_flist->ndx_start]; + if (solo_file) + strlcpy(fbuf, solo_file, sizeof fbuf); + else + f_name(file, fbuf); + recv_generator(fbuf, file, ndx, itemizing, code, sock_f_out); + cur_flist->to_redo--; + + cur_flist = flist; + + csum_length = SHORT_SUM_LENGTH; + max_size = -max_size; + min_size = -min_size; + ignore_existing = -ignore_existing; + ignore_non_existing = -ignore_non_existing; + update_only = -update_only; + always_checksum = -always_checksum; + size_only = -size_only; + append_mode = -append_mode; + make_backups = -make_backups; + ignore_times--; + continue; + } + + if (cur_flist == first_flist) + break; + + /* We only get here if inc_recurse is enabled. */ if (first_flist->in_progress || first_flist->to_redo) break; @@ -1824,10 +1960,8 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo) if (delete_during == 2 || !dir_tweaking) { /* Skip directory touch-up. */ - } else if (first_flist->ndx_start != 0) + } else if (first_flist->parent_ndx >= 0) touch_up_dirs(dir_flist, first_flist->parent_ndx); - else if (relative_paths && implied_dirs) - touch_up_dirs(first_flist, -1); flist_free(first_flist); /* updates first_flist */ } @@ -1839,7 +1973,6 @@ void generate_files(int f_out, const char *local_name) char fbuf[MAXPATHLEN]; int itemizing; enum logcode code; - int need_retouch_dir_perms = 0; int save_do_progress = do_progress; if (protocol_version >= 29) { @@ -1861,13 +1994,13 @@ void generate_files(int f_out, const char *local_name) } solo_file = local_name; dir_tweaking = !(list_only || solo_file || dry_run); - need_retouch_dir_times = preserve_times && !omit_dir_times; + need_retouch_dir_times = preserve_times > 1; lull_mod = allowed_lull * 5; if (verbose > 2) rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid()); - if (delete_before && !solo_file && cur_flist->count > 0) + if (delete_before && !solo_file && cur_flist->used > 0) do_delete_pass(); if (delete_during == 2) { deldelay_size = BIGPATHBUFLEN * 4; @@ -1895,16 +2028,28 @@ void generate_files(int f_out, const char *local_name) dflt_perms = (ACCESSPERMS & ~orig_umask); do { - if (inc_recurse && delete_during && cur_flist->ndx_start) { +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && inc_recurse) { + while (!flist_eof && file_total < FILECNT_LOOKAHEAD/2) + wait_for_receiver(); + } +#endif + + if (inc_recurse && cur_flist->parent_ndx >= 0) { struct file_struct *fp = dir_flist->files[cur_flist->parent_ndx]; - if (BITS_SETnUNSET(fp->flags, FLAG_XFER_DIR, FLAG_MISSING_DIR)) { - dev_t dirdev; - if (one_file_system) { - uint32 *devp = F_DIRDEV_P(fp); - dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); - } else - dirdev = MAKEDEV(0, 0); - delete_in_dir(f_name(fp, fbuf), fp, &dirdev); + f_name(fp, fbuf); + ndx = cur_flist->ndx_start - 1; + recv_generator(fbuf, fp, ndx, itemizing, code, f_out); + if (delete_during && dry_run < 2 && !list_only) { + if (BITS_SETnUNSET(fp->flags, FLAG_CONTENT_DIR, FLAG_MISSING_DIR)) { + dev_t dirdev; + if (one_file_system) { + uint32 *devp = F_DIR_DEV_P(fp); + dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); + } else + dirdev = MAKEDEV(0, 0); + delete_in_dir(f_name(fp, fbuf), fp, &dirdev); + } } } for (i = cur_flist->low; i <= cur_flist->high; i++) { @@ -1913,11 +2058,9 @@ void generate_files(int f_out, const char *local_name) if (!F_IS_ACTIVE(file)) continue; -#ifdef ICONV_OPTION - if (ic_ndx) + if (unsort_ndx) ndx = F_NDX(file); else -#endif ndx = i + cur_flist->ndx_start; if (solo_file) @@ -1926,24 +2069,6 @@ void generate_files(int f_out, const char *local_name) f_name(file, fbuf); recv_generator(fbuf, file, ndx, itemizing, code, f_out); - /* 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. */ -#ifdef HAVE_CHMOD - if (!am_root && S_ISDIR(file->mode) - && !(file->mode & S_IWUSR) && dir_tweaking) { - mode_t mode = file->mode | S_IWUSR; - const char *fname = solo_file ? solo_file : fbuf; - if (do_chmod(fname, mode) < 0) { - rsyserr(FERROR, errno, - "failed to modify permissions on %s", - full_fname(fname)); - } - need_retouch_dir_perms = 1; - } -#endif - check_for_finished_files(itemizing, code, 0); if (allowed_lull && !(i % lull_mod))