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
Updated to remove completed items and add a little more info for
[rsync/rsync.git]
/
compat.c
diff --git
a/compat.c
b/compat.c
index
57563b0
..
93f0f27
100644
(file)
--- a/
compat.c
+++ b/
compat.c
@@
-30,6
+30,7
@@
int remote_protocol = 0;
extern int verbose;
extern int am_server;
extern int am_sender;
extern int verbose;
extern int am_server;
extern int am_sender;
+extern int fuzzy_basis;
extern int read_batch;
extern int checksum_seed;
extern int protocol_version;
extern int read_batch;
extern int checksum_seed;
extern int protocol_version;
@@
-37,13
+38,9
@@
extern int protocol_version;
void setup_protocol(int f_out,int f_in)
{
if (remote_protocol == 0) {
void setup_protocol(int f_out,int f_in)
{
if (remote_protocol == 0) {
- if (am_server) {
- remote_protocol = read_int(f_in);
+ if (!read_batch)
write_int(f_out, protocol_version);
write_int(f_out, protocol_version);
- } else {
- write_int(f_out, protocol_version);
- remote_protocol = read_int(f_in);
- }
+ remote_protocol = read_int(f_in);
if (protocol_version > remote_protocol)
protocol_version = remote_protocol;
}
if (protocol_version > remote_protocol)
protocol_version = remote_protocol;
}
@@
-59,7
+56,7
@@
void setup_protocol(int f_out,int f_in)
}
if (remote_protocol < MIN_PROTOCOL_VERSION
|| remote_protocol > MAX_PROTOCOL_VERSION) {
}
if (remote_protocol < MIN_PROTOCOL_VERSION
|| remote_protocol > MAX_PROTOCOL_VERSION) {
- rprintf(FERROR,"protocol version mismatch - is your shell clean?\n");
+ rprintf(FERROR,"protocol version mismatch -
-
is your shell clean?\n");
rprintf(FERROR,"(see the rsync man page for an explanation)\n");
exit_cleanup(RERR_PROTOCOL);
}
rprintf(FERROR,"(see the rsync man page for an explanation)\n");
exit_cleanup(RERR_PROTOCOL);
}
@@
-78,6
+75,13
@@
void setup_protocol(int f_out,int f_in)
exit_cleanup(RERR_PROTOCOL);
}
exit_cleanup(RERR_PROTOCOL);
}
+ if (fuzzy_basis && protocol_version < 29) {
+ rprintf(FERROR,
+ "--fuzzy requres protocol 29 or higher (negotiated %d).\n",
+ protocol_version);
+ exit_cleanup(RERR_PROTOCOL);
+ }
+
if (am_server) {
if (!checksum_seed)
checksum_seed = time(NULL);
if (am_server) {
if (!checksum_seed)
checksum_seed = time(NULL);