* 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 3 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
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;
{
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)
{
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;
if (server_filter_list.head) {
if (excluded_below >= 0) {
- if (F_DEPTH(file) > excluded_below)
+ if (F_DEPTH(file) > excluded_below
+ && (implied_dirs || 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,
}
if (missing_below >= 0) {
- if (F_DEPTH(file) <= missing_below) {
+ if (F_DEPTH(file) <= missing_below
+ || (!implied_dirs && !f_name_has_prefix(file, missing_dir))) {
if (dry_run)
dry_run--;
missing_below = -1;
if (dry_run)
dry_run++;
missing_below = F_DEPTH(file);
+ missing_dir = file;
}
file->flags |= FLAG_MISSING_DIR;
}
* (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;
rsyserr(FERROR, 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;
}
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);
}
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",
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",
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;
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)
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;
* 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))
+ 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))
while (preserve_hard_links && (ndx = get_hlink_num()) != -1) {
flist = flist_for_ndx(ndx);
assert(flist != NULL);
- file = flist->files[ndx];
+ file = flist->files[ndx - flist->ndx_start];
assert(file->flags & FLAG_HLINKED);
finish_hard_link(file, f_name(file, fbuf), NULL, itemizing, code, -1);
}
maybe_flush_socket(1);
}
- if (delete_during == 2 || !dir_tweaking) {
- /* Skip directory touch-up. */
- } else if (first_flist->ndx_start != 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 */
}
}
}
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)
dflt_perms = (ACCESSPERMS & ~orig_umask);
do {
+#ifdef SUPPORT_HARD_LINKS
+ if (inc_recurse && preserve_hard_links)
+ match_hard_links(cur_flist);
+#endif
if (inc_recurse && cur_flist->ndx_start) {
struct file_struct *fp = dir_flist->files[cur_flist->parent_ndx];
f_name(fp, fbuf);
ndx = cur_flist->ndx_start - 1;
recv_generator(fbuf, fp, ndx, itemizing, code, f_out);
- if (delete_during) {
+ if (delete_during && dry_run < 2) {
if (BITS_SETnUNSET(fp->flags, FLAG_XFER_DIR, FLAG_MISSING_DIR)) {
dev_t dirdev;
if (one_file_system) {
- uint32 *devp = F_DIRDEV_P(fp);
+ uint32 *devp = F_DIR_DEV_P(fp);
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
if (delete_after && !solo_file && file_total > 0)
do_delete_pass();
- if ((need_retouch_dir_perms || need_retouch_dir_times)
- && dir_tweaking && (!inc_recurse || delete_during == 2))
+ if ((need_retouch_dir_perms || need_retouch_dir_times) && dir_tweaking)
touch_up_dirs(dir_flist, -1);
if (max_delete >= 0 && deletion_count > max_delete) {
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff