From 5af6abeb5419cbfe0994c4f2c0f25e44e2920733 Mon Sep 17 00:00:00 2001 From: emaste Date: Mon, 31 Jul 2017 09:28:43 +0000 Subject: [PATCH] MFC r321436: ar: handle partial writes from archive_write_data libarchive may limit a single archive_write_data call to handling 0x7fffffff bytes. Add a loop to handle partial writes. Sponsored by: The FreeBSD Foundation git-svn-id: svn://svn.freebsd.org/base/stable/10@321775 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.bin/ar/write.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c index 10b912ec2..8ab0bf281 100644 --- a/usr.bin/ar/write.c +++ b/usr.bin/ar/write.c @@ -581,10 +581,17 @@ prefault_buffer(const char *buf, size_t s) static void write_data(struct bsdar *bsdar, struct archive *a, const void *buf, size_t s) { + ssize_t written; + prefault_buffer(buf, s); - if (archive_write_data(a, buf, s) != (ssize_t)s) - bsdar_errc(bsdar, EX_SOFTWARE, 0, "%s", - archive_error_string(a)); + while (s > 0) { + written = archive_write_data(a, buf, s); + if (written < 0) + bsdar_errc(bsdar, EX_SOFTWARE, 0, "%s", + archive_error_string(a)); + buf = (const char *)buf + written; + s -= written; + } } /* -- 2.45.0