d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out the previous commit, and fix the bug rather than try to hide its

Browse Source 
symptoms: make timeouts and short transfers fatal, and set errno to an
appropriate value (ETIMEDOUT for a timeout, EPIPE for a short transfer).

MFC after:	2 weeks
This commit is contained in:
Dag-Erling Smørgrav 2002-10-27 15:08:21 +00:00
parent 4caad4e81d
commit e24f60e74f
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/libfetch/common.c
View File

@ -364,13 +364,17 @@ _fetch_read(conn_t *conn, char *buf, size_t len)
wait.tv_usec += 1000000; wait.tv_usec += 1000000;
wait.tv_sec--; wait.tv_sec--;
} }
if (wait.tv_sec < 0) if (wait.tv_sec < 0) {
return (rlen); errno = ETIMEDOUT;
_fetch_syserr();
return (-1);
}
errno = 0; errno = 0;
r = select(conn->sd + 1, &readfds, NULL, NULL, &wait); r = select(conn->sd + 1, &readfds, NULL, NULL, &wait);
if (r == -1) { if (r == -1) {
if (errno == EINTR && fetchRestartCalls) if (errno == EINTR && fetchRestartCalls)
continue; continue;
_fetch_syserr();
return (-1); return (-1);
} }
} }
@ -380,8 +384,12 @@ _fetch_read(conn_t *conn, char *buf, size_t len)
else else
#endif #endif
rlen = read(conn->sd, buf, len); rlen = read(conn->sd, buf, len);
if (rlen == 0) if (rlen == 0) {
break; /* we consider a short read a failure */
errno = EPIPE;
_fetch_syserr();
return (-1);
}
if (rlen < 0) { if (rlen < 0) {
if (errno == EINTR && fetchRestartCalls) if (errno == EINTR && fetchRestartCalls)
continue; continue;
@ -406,7 +414,6 @@ _fetch_getln(conn_t *conn)
char *tmp; char *tmp;
size_t tmpsize; size_t tmpsize;
char c; char c;
int error;
if (conn->buf == NULL) { if (conn->buf == NULL) {
if ((conn->buf = malloc(MIN_BUF_SIZE)) == NULL) { if ((conn->buf = malloc(MIN_BUF_SIZE)) == NULL) {
@ -420,11 +427,8 @@ _fetch_getln(conn_t *conn)
conn->buflen = 0; conn->buflen = 0;
do { do {
error = _fetch_read(conn, &c, 1); if (_fetch_read(conn, &c, 1) == -1)
if (error == -1)
return (-1); return (-1);
else if (error == 0)
break;
conn->buf[conn->buflen++] = c; conn->buf[conn->buflen++] = c;
if (conn->buflen == conn->bufsize) { if (conn->buflen == conn->bufsize) {
tmp = conn->buf; tmp = conn->buf;
@ -473,6 +477,7 @@ _fetch_write(conn_t *conn, const char *buf, size_t len)
} }
if (wait.tv_sec < 0) { if (wait.tv_sec < 0) {
errno = ETIMEDOUT; errno = ETIMEDOUT;
_fetch_syserr();
return (-1); return (-1);
} }
errno = 0; errno = 0;
@ -490,9 +495,12 @@ _fetch_write(conn_t *conn, const char *buf, size_t len)
else else
#endif #endif
wlen = write(conn->sd, buf, len); wlen = write(conn->sd, buf, len);
if (wlen == 0) if (wlen == 0) {
/* we consider a short write a failure */ /* we consider a short write a failure */
errno = EPIPE;
_fetch_syserr();
return (-1); return (-1);
}
if (wlen < 0) { if (wlen < 0) {
if (errno == EINTR && fetchRestartCalls) if (errno == EINTR && fetchRestartCalls)
continue; continue;