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

Recommit the non-broken parts of 1.34 and 1.37.

Browse Source 
Change the type and name of a variable introduced in 1.33.
This commit is contained in:
Dag-Erling Smørgrav 2002-10-30 04:43:00 +00:00
parent cab8495092
commit bb13d0af67
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=106186
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
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_sec--;
}
if (wait.tv_sec < 0)
return (rlen);
if (wait.tv_sec < 0) {
errno = ETIMEDOUT;
_fetch_syserr();
return (-1);
}
errno = 0;
r = select(conn->sd + 1, &readfds, NULL, NULL, &wait);
if (r == -1) {
if (errno == EINTR && fetchRestartCalls)
continue;
_fetch_syserr();
return (-1);
}
}
@ -405,8 +409,8 @@ _fetch_getln(conn_t *conn)
{
char *tmp;
size_t tmpsize;
ssize_t len;
char c;
int error;
if (conn->buf == NULL) {
if ((conn->buf = malloc(MIN_BUF_SIZE)) == NULL) {
@ -420,10 +424,10 @@ _fetch_getln(conn_t *conn)
conn->buflen = 0;
do {
error = _fetch_read(conn, &c, 1);
if (error == -1)
len = _fetch_read(conn, &c, 1);
if (len == -1)
return (-1);
else if (error == 0)
if (len == 0)
break;
conn->buf[conn->buflen++] = c;
if (conn->buflen == conn->bufsize) {
@ -488,6 +492,7 @@ _fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt)
}
if (wait.tv_sec < 0) {
errno = ETIMEDOUT;
_fetch_syserr();
return (-1);
}
errno = 0;