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
Fix from Jos for batch mode on Solaris.
[rsync/rsync.git]
/
compat.c
diff --git
a/compat.c
b/compat.c
index
af72f8b
..
72e0f99
100644
(file)
--- a/
compat.c
+++ b/
compat.c
@@
-23,8
+23,6
@@
extern int am_server;
extern int am_server;
-extern int csum_length;
-
extern int preserve_links;
extern int preserve_perms;
extern int preserve_devices;
extern int preserve_links;
extern int preserve_perms;
extern int preserve_devices;
@@
-38,6
+36,9
@@
extern int checksum_seed;
extern int remote_version;
extern int verbose;
extern int remote_version;
extern int verbose;
+extern int read_batch; /* dw */
+extern int write_batch; /* dw */
+
void setup_protocol(int f_out,int f_in)
{
if (remote_version == 0) {
void setup_protocol(int f_out,int f_in)
{
if (remote_version == 0) {
@@
-57,12
+58,11
@@
void setup_protocol(int f_out,int f_in)
exit_cleanup(RERR_PROTOCOL);
}
exit_cleanup(RERR_PROTOCOL);
}
- if (verbose > 2)
- rprintf(FINFO, "local_version=%d remote_version=%d\n",
- PROTOCOL_VERSION, remote_version);
-
if (remote_version >= 12) {
if (am_server) {
if (remote_version >= 12) {
if (am_server) {
+ if (read_batch || write_batch) /* dw */
+ checksum_seed = 32761;
+ else
checksum_seed = time(NULL);
write_int(f_out,checksum_seed);
} else {
checksum_seed = time(NULL);
write_int(f_out,checksum_seed);
} else {