emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix possible bug if file length not known

Browse Source
This commit is contained in:
Glenn L McGrath 2002-12-13 04:14:36 +00:00
parent 02d7cbfe92
commit 3b33dd9b1e
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
networking/ftpgetput.c
View File

@ -56,14 +56,20 @@ typedef struct ftp_host_info_s {
static char verbose_flag; static char verbose_flag;
static char do_continue = 0; static char do_continue = 0;
/* If chunksize == 0 read till end of file */ static int copyfd_chunk(int fd1, int fd2, const off_t chunksize)
static int copyfd_chunk(int fd1, int fd2, off_t chunksize)
{ {
size_t nread; size_t nread;
size_t nwritten; size_t nwritten;
size_t size; size_t size;
size_t remaining;
char buffer[BUFSIZ]; char buffer[BUFSIZ];
if (chunksize) {
remaining = chunksize;
} else {
remaining = -1;
}
do { do {
if ((chunksize > BUFSIZ) || (chunksize == 0)) { if ((chunksize > BUFSIZ) || (chunksize == 0)) {
size = BUFSIZ; size = BUFSIZ;
@ -73,7 +79,7 @@ static int copyfd_chunk(int fd1, int fd2, off_t chunksize)
nread = safe_read(fd1, buffer, size); nread = safe_read(fd1, buffer, size);
if (nread < 0) { if (nread <= 0) {
if (chunksize) { if (chunksize) {
perror_msg_and_die("read error"); perror_msg_and_die("read error");
} else { } else {
@ -88,10 +94,9 @@ static int copyfd_chunk(int fd1, int fd2, off_t chunksize)
} }
if (chunksize) { if (chunksize) {
chunksize -= nwritten; remaining -= nwritten;
} }
} while (remaining != 0);
} while (chunksize);
return 0; return 0;
} }