Clean up the error handling in the

write path.  In particular, this should
solve some problems people have seen with
bsdtar not exiting on various write errors.

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/libarchive/archive_write.c b/lib/libarchive/archive_write.c
index 40f660d..76b4288 100644
--- a/lib/libarchive/archive_write.c
+++ b/lib/libarchive/archive_write.c
@@ -215,9 +215,12 @@ archive_write_header(struct archive *a, struct archive_entry *entry)
 /*
  * Note that the compressor is responsible for blocking.
  */
+/* Should be "ssize_t", but that breaks the ABI.  <sigh> */
 int
 archive_write_data(struct archive *a, const void *buff, size_t s)
 {
+	int ret;
 	archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_DATA);
-	return (a->format_write_data(a, buff, s));
+	ret = (a->format_write_data)(a, buff, s);
+	return (ret == ARCHIVE_OK ? (ssize_t)s : -1);
 }