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
If --backup was specified without a --backup-dir, don't preserve the
[rsync/rsync.git]
/
compat.c
diff --git
a/compat.c
b/compat.c
index
c2a1103
..
6bd1a57
100644
(file)
--- a/
compat.c
+++ b/
compat.c
@@
-29,22
+29,11
@@
int remote_protocol = 0;
extern int am_server;
extern int am_server;
-extern int preserve_links;
-extern int preserve_perms;
-extern int preserve_devices;
-extern int preserve_uid;
-extern int preserve_gid;
-extern int preserve_times;
-extern int always_checksum;
extern int checksum_seed;
extern int checksum_seed;
-
extern int protocol_version;
extern int verbose;
extern int protocol_version;
extern int verbose;
-extern int read_batch;
-extern int write_batch;
-
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) {
@@
-85,11
+74,9
@@
void setup_protocol(int f_out,int f_in)
}
if (am_server) {
}
if (am_server) {
- if (read_batch || write_batch)
- checksum_seed = 32761;
- else
+ if (!checksum_seed)
checksum_seed = time(NULL);
checksum_seed = time(NULL);
- write_int(f_out,checksum_seed);
+ write_int(f_out,
checksum_seed);
} else {
checksum_seed = read_int(f_in);
}
} else {
checksum_seed = read_int(f_in);
}