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
Don't send a bogus "-" option to an older server if there were
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
21e8134
..
f8712dd
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-64,7
+64,6
@@
const char phase_unknown[] = "unknown";
int ignore_timeout = 0;
int batch_fd = -1;
int msgdone_cnt = 0;
int ignore_timeout = 0;
int batch_fd = -1;
int msgdone_cnt = 0;
-int check_for_io_err = 0;
/* Ignore an EOF error if non-zero. See whine_about_eof(). */
int kluge_around_eof = 0;
/* Ignore an EOF error if non-zero. See whine_about_eof(). */
int kluge_around_eof = 0;
@@
-378,8
+377,6
@@
static void read_msg_fd(void)
len = tag & 0xFFFFFF;
tag = (tag >> 24) - MPLEX_BASE;
len = tag & 0xFFFFFF;
tag = (tag >> 24) - MPLEX_BASE;
- check_for_io_err = 0;
-
switch (tag) {
case MSG_DONE:
if (len < 0 || len > 1 || !am_generator) {
switch (tag) {
case MSG_DONE:
if (len < 0 || len > 1 || !am_generator) {
@@
-414,9
+411,6
@@
static void read_msg_fd(void)
}
flist = recv_file_list(fd);
flist->parent_ndx = IVAL(buf,0);
}
flist = recv_file_list(fd);
flist->parent_ndx = IVAL(buf,0);
- /* If the sender is going to send us an MSG_IO_ERROR value, it
- * will always be the very next message following MSG_FLIST. */
- check_for_io_err = 1;
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links)
match_hard_links(flist);
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links)
match_hard_links(flist);
@@
-572,7
+566,7
@@
void send_msg_int(enum msgcode code, int num)
void wait_for_receiver(void)
{
void wait_for_receiver(void)
{
- if (io_flush(
FUL
L_FLUSH))
+ if (io_flush(
NORMA
L_FLUSH))
return;
read_msg_fd();
}
return;
read_msg_fd();
}
@@
-1064,8
+1058,6
@@
static int readfd_unbuffered(int fd, char *buf, size_t len)
msg_bytes = tag & 0xFFFFFF;
tag = (tag >> 24) - MPLEX_BASE;
msg_bytes = tag & 0xFFFFFF;
tag = (tag >> 24) - MPLEX_BASE;
- check_for_io_err = 0;
-
switch (tag) {
case MSG_DATA:
if (msg_bytes > iobuf_in_siz) {
switch (tag) {
case MSG_DATA:
if (msg_bytes > iobuf_in_siz) {