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

Correct errors preventing busybox tar from working properly,

Browse Source 
fixing bug http://bugs.uclibc.org/view.php?id=231
This commit is contained in:
Eric Andersen 2005-04-27 10:51:38 +00:00
parent edb3fbc305
commit fef32b570b
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libbb/copyfd.c
View File

@ -39,7 +39,7 @@ static size_t bb_full_fd_action(int src_fd, int dst_fd, const size_t size2)
int status; int status;
size_t xread, wrote, total, size = size2; size_t xread, wrote, total, size = size2;
if ((dst_fd < 0) || (src_fd < 0)) { if (src_fd < 0) {
return -1; return -1;
} }
@ -56,11 +56,16 @@ static size_t bb_full_fd_action(int src_fd, int dst_fd, const size_t size2)
while (total < size) while (total < size)
{ {
xread = BUFSIZ; xread = BUFSIZ;
if (size < (wrote + BUFSIZ)) if (size < (total + BUFSIZ))
xread = size - wrote; xread = size - total;
xread = bb_full_read(src_fd, buffer, xread); xread = bb_full_read(src_fd, buffer, xread);
if (xread > 0) { if (xread > 0) {
wrote = bb_full_write(dst_fd, buffer, xread); if (dst_fd < 0) {
/* A -1 dst_fd means we need to fake it... */
wrote = xread;
} else {
wrote = bb_full_write(dst_fd, buffer, xread);
}
if (wrote < xread) { if (wrote < xread) {
bb_perror_msg(bb_msg_write_error); bb_perror_msg(bb_msg_write_error);
break; break;
@ -78,8 +83,8 @@ static size_t bb_full_fd_action(int src_fd, int dst_fd, const size_t size2)
RELEASE_CONFIG_BUFFER(buffer); RELEASE_CONFIG_BUFFER(buffer);
} }
if (status == 0 || wrote) if (status == 0 || total)
return wrote; return total;
/* Some sortof error occured */ /* Some sortof error occured */
return -1; return -1;
} }