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
Refer to the old basedir variable as dir.root.
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
3611e13
..
944bb24
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-914,7
+914,10
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
"You may not combine multiple --delete-WHEN options.\n");
return 0;
}
"You may not combine multiple --delete-WHEN options.\n");
return 0;
}
- if (delete_before || delete_during || delete_after)
+ if (!recurse) {
+ delete_before = delete_during = delete_after = 0;
+ delete_mode = delete_excluded = 0;
+ } else if (delete_before || delete_during || delete_after)
delete_mode = 1;
else if (delete_mode || delete_excluded)
delete_mode = delete_before = 1;
delete_mode = 1;
else if (delete_mode || delete_excluded)
delete_mode = delete_before = 1;
@@
-1126,7
+1129,7
@@
void server_options(char **args,int *argc)
if (copy_links)
argstr[x++] = 'L';
if (xfer_dirs > 1)
if (copy_links)
argstr[x++] = 'L';
if (xfer_dirs > 1)
- argstr[x++] = '
k
';
+ argstr[x++] = '
d
';
if (keep_dirlinks && am_sender)
argstr[x++] = 'K';
if (keep_dirlinks && am_sender)
argstr[x++] = 'K';