diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1998-01-16 07:37:05 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1998-01-16 07:37:05 +0000 |
| commit | 2f7579bd8d70f408d39de77d323c987f450b667d (patch) | |
| tree | a0763e77805f1fbffc3458f5d74f60a9d26946de /bin | |
| parent | 85dace5d5979262350992008e80042703be6f6aa (diff) | |
Notes
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/cp/utils.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/bin/cp/utils.c b/bin/cp/utils.c index ecd9790f9aa49..85de4a4685644 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: utils.c,v 1.13 1997/02/22 14:01:34 peter Exp $ + * $Id: utils.c,v 1.14 1997/10/03 18:11:14 wosch Exp $ */ #ifndef lint @@ -60,7 +60,8 @@ copy_file(entp, dne) { static char buf[MAXBSIZE]; struct stat to_stat, *fs; - int ch, checkch, from_fd, rcount, rval, to_fd, wcount; + int ch, checkch, from_fd, rcount, rval, to_fd, wcount, wresid; + char *bufp; #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED char *p; #endif @@ -128,7 +129,13 @@ copy_file(entp, dne) warn("%s", entp->fts_path); rval = 1; } else { - if (write(to_fd, p, fs->st_size) != fs->st_size) { + for (bufp = p, wresid = fs->st_size; ; + bufp += wcount, wresid -= wcount) + wcount = write(to_fd, bufp, wresid); + if (wcount >= wresid || wcount <= 0) + break; + } + if (wcount != wresid) { warn("%s", to.p_path); rval = 1; } @@ -142,8 +149,13 @@ copy_file(entp, dne) #endif { while ((rcount = read(from_fd, buf, MAXBSIZE)) > 0) { - wcount = write(to_fd, buf, rcount); - if (rcount != wcount || wcount == -1) { + for (bufp = buf, wresid = rcount; ; + bufp += wcount, wresid -= wcount) { + wcount = write(to_fd, bufp, wresid); + if (wcount >= wresid || wcount <= 0) + break; + } + if (wcount != wresid) { warn("%s", to.p_path); rval = 1; break; |