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

When cp ran out of space it didn't return a nonzero error code. Fixes bug 493.

Browse Source
This commit is contained in:
Rob Landley 2005-11-04 01:20:46 +00:00
parent c2ce2c5b4b
commit 21ccbb6c0e
1 changed files with 27 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
libbb/copyfd.c
View File

@ -4,19 +4,7 @@
* *
* Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> * Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
* *
* This program is free software; you can redistribute it and/or modify * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <errno.h> #include <errno.h>
@ -34,59 +22,41 @@
#endif #endif
static size_t bb_full_fd_action(int src_fd, int dst_fd, const size_t size2) static ssize_t bb_full_fd_action(int src_fd, int dst_fd, size_t size)
{ {
int status; int status = -1;
size_t xread, wrote, total, size = size2; size_t total = 0;
RESERVE_CONFIG_BUFFER(buffer,BUFSIZ);
if (src_fd < 0) { if (src_fd < 0) goto out;
return -1;
}
if (size == 0) {
/* If size is 0 copy until EOF */
size = ULONG_MAX;
}
while (!size || total < size)
{ {
RESERVE_CONFIG_BUFFER(buffer,BUFSIZ); ssize_t wrote, xread = (size && size < BUFSIZ) ? size : BUFSIZ;
total = 0; xread = bb_full_read(src_fd, buffer, xread);
wrote = 0; if (xread > 0) {
status = -1; /* A -1 dst_fd means we need to fake it... */
while (total < size) wrote = (dst_fd < 0) ? xread : bb_full_write(dst_fd, buffer, xread);
{ if (wrote < xread) {
xread = BUFSIZ; bb_perror_msg(bb_msg_write_error);
if (size < (total + BUFSIZ))
xread = size - total;
xread = bb_full_read(src_fd, buffer, xread);
if (xread > 0) {
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) {
bb_perror_msg(bb_msg_write_error);
break;
}
total += wrote;
} else if (xread < 0) {
bb_perror_msg(bb_msg_read_error);
break;
} else if (xread == 0) {
/* All done. */
status = 0;
break; break;
} }
total += wrote;
size -= wrote;
} else if (xread < 0) {
bb_perror_msg(bb_msg_read_error);
break;
} else if (xread == 0) {
/* All done. */
status = 0;
break;
} }
RELEASE_CONFIG_BUFFER(buffer);
} }
out:
RELEASE_CONFIG_BUFFER(buffer);
if (status == 0 || total) return status ? status : total;
return total;
/* Some sortof error occured */
return -1;
} }