mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-01-22 22:08:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improved on the list-only fix and on the other similar checks that want

Browse Source 
to ignore implied dirs that are actually present in the file list
when inc_recurse is active and --no-implied-dirs was specified.
This commit is contained in:
Wayne Davison
2007-10-07 07:18:49 +00:00
parent ff0284ddc4
commit 38943d29d3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
generator.c
View File

@@ -1138,9 +1138,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx);
if (list_only) {
if (S_ISDIR(file->mode)
&& ((relative_paths && !implied_dirs && !(file->flags & FLAG_XFER_DIR))
|| (inc_recurse && ndx != cur_flist->ndx_start - 1)))
if (S_ISDIR(file->mode) && inc_recurse
&& ((!implied_dirs && !(file->flags & FLAG_XFER_DIR))
|| ndx != cur_flist->ndx_start - 1))
return;
list_file_entry(file);
return;
@@ -1248,7 +1248,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
if (S_ISDIR(file->mode)) {
if (!implied_dirs && !(file->flags & FLAG_XFER_DIR))
if (inc_recurse && !implied_dirs && !(file->flags & FLAG_XFER_DIR))
goto cleanup;
if (inc_recurse && ndx != cur_flist->ndx_start - 1) {
/* In inc_recurse mode we want ot make sure any missing
@@ -1832,7 +1832,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
for (i = start; i <= end; i++, counter++) {
file = flist->files[i];
if (!S_ISDIR(file->mode)
|| (relative_paths && !implied_dirs && !(file->flags & FLAG_XFER_DIR)))
|| (inc_recurse && !implied_dirs && !(file->flags & FLAG_XFER_DIR)))
continue;
if (verbose > 3) {
fname = f_name(file, NULL);