summaryrefslogtreecommitdiff
path: root/compat.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2007-10-16 18:33:47 +0000
committerWayne Davison <wayned@samba.org>2007-10-16 18:33:47 +0000
commitaabb50d4e391be5768fa76170372e28e85902f95 (patch)
tree7bddc80641f446c06e51a7d495c3a307b2c52f1a /compat.c
parent03646b49105f5a7c885b57a6978da544504cf6a1 (diff)
downloadrsync-aabb50d4e391be5768fa76170372e28e85902f95.tar.gz
rsync-aabb50d4e391be5768fa76170372e28e85902f95.tar.bz2
rsync-aabb50d4e391be5768fa76170372e28e85902f95.zip
Tweaked set_allow_inc_recurse() a bit more.
Diffstat (limited to 'compat.c')
-rw-r--r--compat.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/compat.c b/compat.c
index b0574242..d72069d6 100644
--- a/compat.c
+++ b/compat.c
@@ -104,8 +104,11 @@ static void check_sub_protocol(void)
void set_allow_inc_recurse(void)
{
- if (!recurse || delete_before || delete_after || use_qsort
- || (!am_sender && (delay_updates || prune_empty_dirs)))
+ if (!recurse || use_qsort)
+ allow_inc_recurse = 0;
+ else if (!am_sender
+ && (delete_before || delete_after
+ || delay_updates || prune_empty_dirs))
allow_inc_recurse = 0;
else if (am_server && !local_server
&& (!shell_cmd || strchr(shell_cmd, 'i') == NULL))