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

Allow fetching pkg(8) even if servers/proxies are not passing Content-length

Browse Source
This commit is contained in:
Baptiste Daroussin 2015-04-03 17:35:30 +00:00
parent 5d291f76e6
commit cc36fe4926
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.sbin/pkg/pkg.c
View File

@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#include <ucl.h>
@ -177,14 +176,11 @@ fetch_to_fd(const char *url, char *path)
/* To store _https._tcp. + hostname + \0 */
int fd;
int retry, max_retry;
off_t done, r;
time_t now, last;
ssize_t r;
char buf[10240];
char zone[MAXHOSTNAMELEN + 13];
static const char *mirror_type = NULL;
done = 0;
last = 0;
max_retry = 3;
current = mirrors = NULL;
remote = NULL;
@ -238,19 +234,16 @@ fetch_to_fd(const char *url, char *path)
}
}
while (done < st.size) {
if ((r = fread(buf, 1, sizeof(buf), remote)) < 1)
break;
while ((r = fread(buf, 1, sizeof(buf), remote)) > 0) {
if (write(fd, buf, r) != r) {
warn("write()");
goto fetchfail;
}
}
done += r;
now = time(NULL);
if (now > last || done == st.size)
last = now;
if (r != 0) {
warn("An error occurred while fetching pkg(8)");
goto fetchfail;
}
if (ferror(remote))