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

My last change to this file broke tar x. Sigh. (Trying to make sure we work

Browse Source 
on file sizes between 2 and 4 gigs on 32 bit machines.  For supporting >4 gigs,
just use a 64 bit machine already...)
This commit is contained in:
Rob Landley
2005-11-12 11:04:11 +00:00
parent 5412843e79
commit 9033453c18
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libbb/copyfd.c
View File

@@ -29,11 +29,13 @@ static ssize_t bb_full_fd_action(int src_fd, int dst_fd, size_t size)
RESERVE_CONFIG_BUFFER(buffer,BUFSIZ); RESERVE_CONFIG_BUFFER(buffer,BUFSIZ);
if (src_fd < 0) goto out; if (src_fd < 0) goto out;
while (!size || total < size) while (!size || total < size)
{ {
ssize_t wrote, xread = (size && size < BUFSIZ) ? size : BUFSIZ; ssize_t wrote, xread;
xread = safe_read(src_fd, buffer, xread);
xread = safe_read(src_fd, buffer,
(!size || size - total > BUFSIZ) ? BUFSIZ : size - total);
if (xread > 0) { if (xread > 0) {
/* A -1 dst_fd means we need to fake it... */ /* A -1 dst_fd means we need to fake it... */
wrote = (dst_fd < 0) ? xread : bb_full_write(dst_fd, buffer, xread); wrote = (dst_fd < 0) ? xread : bb_full_write(dst_fd, buffer, xread);
@@ -42,7 +44,6 @@ static ssize_t bb_full_fd_action(int src_fd, int dst_fd, size_t size)
break; break;
} }
total += wrote; total += wrote;
size -= wrote;
} else if (xread < 0) { } else if (xread < 0) {
bb_perror_msg(bb_msg_read_error); bb_perror_msg(bb_msg_read_error);
break; break;