Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved on the list-only fix and on the other similar checks that want
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
e6e5003
..
aaf831d
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-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) {
rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx);
if (list_only) {
- if (S_ISDIR(file->mode)
+ if (S_ISDIR(file->mode)
&& inc_recurse
&& ((!implied_dirs && !(file->flags & FLAG_XFER_DIR))
&& ((!implied_dirs && !(file->flags & FLAG_XFER_DIR))
- ||
(inc_recurse && ndx != cur_flist->ndx_start - 1)
))
+ ||
ndx != cur_flist->ndx_start - 1
))
return;
list_file_entry(file);
return;
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 (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
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)
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);
continue;
if (verbose > 3) {
fname = f_name(file, NULL);