mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-01-28 16:51:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change safe_read() to select() before reading.

Browse Source
This commit is contained in:
Wayne Davison
2013-11-09 10:32:44 -08:00
parent 708db6f772
commit 090ef59b29
1 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
io.c
View File

@@ -232,28 +232,10 @@ static NORETURN void whine_about_eof(BOOL allow_kluge)
* the socket except very early in the transfer. */
static size_t safe_read(int fd, char *buf, size_t len)
{
size_t got;
int n;
size_t got = 0;
assert(fd != iobuf.in_fd);
n = read(fd, buf, len);
if ((size_t)n == len || n == 0) {
if (DEBUG_GTE(IO, 2))
rprintf(FINFO, "[%s] safe_read(%d)=%ld\n", who_am_i(), fd, (long)n);
return n;
}
if (n < 0) {
if (errno != EINTR && errno != EWOULDBLOCK && errno != EAGAIN) {
read_failed:
rsyserr(FERROR, errno, "safe_read failed to read %ld bytes [%s]",
(long)len, who_am_i());
exit_cleanup(RERR_STREAMIO);
}
got = 0;
} else
got = n;
while (1) {
struct timeval tv;
fd_set r_fds, e_fds;
@@ -282,7 +264,7 @@ static size_t safe_read(int fd, char *buf, size_t len)
rprintf(FINFO, "select exception on fd %d\n", fd); */
if (FD_ISSET(fd, &r_fds)) {
n = read(fd, buf + got, len - got);
int n = read(fd, buf + got, len - got);
if (DEBUG_GTE(IO, 2))
rprintf(FINFO, "[%s] safe_read(%d)=%ld\n", who_am_i(), fd, (long)n);
if (n == 0)
@@ -290,7 +272,9 @@ static size_t safe_read(int fd, char *buf, size_t len)
if (n < 0) {
if (errno == EINTR)
continue;
goto read_failed;
rsyserr(FERROR, errno, "safe_read failed to read %ld bytes [%s]",
(long)len, who_am_i());
exit_cleanup(RERR_STREAMIO);
}
if ((got += (size_t)n) == len)
break;