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
Use the new saw_delete* variables to ensure that the server side
[rsync/rsync.git]
/
exclude.c
diff --git
a/exclude.c
b/exclude.c
index
1740f7b
..
4843489
100644
(file)
--- a/
exclude.c
+++ b/
exclude.c
@@
-34,6
+34,8
@@
extern int list_only;
extern int recurse;
extern int io_error;
extern int local_server;
extern int recurse;
extern int io_error;
extern int local_server;
+extern int saw_delete_opt;
+extern int saw_delete_excluded_opt;
extern int delete_mode;
extern int delete_excluded;
extern int cvs_exclude;
extern int delete_mode;
extern int delete_excluded;
extern int cvs_exclude;
@@
-1179,8
+1181,8
@@
void recv_filter_list(int f_in)
{
char line[BIGPATHBUFLEN];
int xflags = protocol_version >= 29 ? 0 : XFLG_OLD_PREFIXES;
{
char line[BIGPATHBUFLEN];
int xflags = protocol_version >= 29 ? 0 : XFLG_OLD_PREFIXES;
- int receiver_wants_list =
delete_mode
- && (!
delete_excluded
|| protocol_version >= 29);
+ int receiver_wants_list =
saw_delete_opt
+ && (!
saw_delete_excluded_opt
|| protocol_version >= 29);
unsigned int len;
if (!local_server && (am_sender || receiver_wants_list)) {
unsigned int len;
if (!local_server && (am_sender || receiver_wants_list)) {