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
Suggest a better solution for a make without wildcard support.
[rsync/rsync.git]
/
compat.c
diff --git
a/compat.c
b/compat.c
index
f5cfbd4
..
ad29501
100644
(file)
--- a/
compat.c
+++ b/
compat.c
@@
-24,6
+24,8
@@
int remote_protocol = 0;
int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
int inc_recurse = 0;
int remote_protocol = 0;
int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
int inc_recurse = 0;
+int compat_flags = 0;
+int use_safe_inc_flist = 0;
extern int am_server;
extern int am_sender;
extern int am_server;
extern int am_sender;
@@
-72,6
+74,7
@@
int filesfrom_convert = 0;
#define CF_INC_RECURSE (1<<0)
#define CF_SYMLINK_TIMES (1<<1)
#define CF_SYMLINK_ICONV (1<<2)
#define CF_INC_RECURSE (1<<0)
#define CF_SYMLINK_TIMES (1<<1)
#define CF_SYMLINK_ICONV (1<<2)
+#define CF_SAFE_FLIST (1<<3)
static const char *client_info;
static const char *client_info;
@@
-245,7
+248,6
@@
void setup_protocol(int f_out,int f_in)
exit_cleanup(RERR_PROTOCOL);
}
} else if (protocol_version >= 30) {
exit_cleanup(RERR_PROTOCOL);
}
} else if (protocol_version >= 30) {
- int compat_flags;
if (am_server) {
compat_flags = allow_inc_recurse ? CF_INC_RECURSE : 0;
#ifdef CAN_SET_SYMLINK_TIMES
if (am_server) {
compat_flags = allow_inc_recurse ? CF_INC_RECURSE : 0;
#ifdef CAN_SET_SYMLINK_TIMES
@@
-254,10
+256,11
@@
void setup_protocol(int f_out,int f_in)
#ifdef ICONV_OPTION
compat_flags |= CF_SYMLINK_ICONV;
#endif
#ifdef ICONV_OPTION
compat_flags |= CF_SYMLINK_ICONV;
#endif
+ if (local_server || strchr(client_info, 'f') != NULL)
+ compat_flags |= CF_SAFE_FLIST;
write_byte(f_out, compat_flags);
write_byte(f_out, compat_flags);
- } else
{
+ } else
compat_flags = read_byte(f_in);
compat_flags = read_byte(f_in);
- }
/* The inc_recurse var MUST be set to 0 or 1. */
inc_recurse = compat_flags & CF_INC_RECURSE ? 1 : 0;
if (am_sender) {
/* The inc_recurse var MUST be set to 0 or 1. */
inc_recurse = compat_flags & CF_INC_RECURSE ? 1 : 0;
if (am_sender) {
@@
-281,6
+284,7
@@
void setup_protocol(int f_out,int f_in)
read_batch ? "batch file" : "connection");
exit_cleanup(RERR_SYNTAX);
}
read_batch ? "batch file" : "connection");
exit_cleanup(RERR_SYNTAX);
}
+ use_safe_inc_flist = (compat_flags & CF_SAFE_FLIST) || protocol_version >= 31;
need_messages_from_generator = 1;
#ifdef CAN_SET_SYMLINK_TIMES
} else if (!am_sender) {
need_messages_from_generator = 1;
#ifdef CAN_SET_SYMLINK_TIMES
} else if (!am_sender) {