From 227b756897ccbf6b0c9c22be4d5381d8a4dd5a91 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sun, 17 Oct 2004 23:47:30 +0000 Subject: [PATCH] Correctly report write errors from the lowest-level output routines back to the compression layer. --- lib/libarchive/archive_write_open_fd.c | 9 +++++++-- lib/libarchive/archive_write_open_file.c | 9 +++++++-- lib/libarchive/archive_write_open_filename.c | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/lib/libarchive/archive_write_open_fd.c b/lib/libarchive/archive_write_open_fd.c index ae8c2e228ee..58bfbd3fbd7 100644 --- a/lib/libarchive/archive_write_open_fd.c +++ b/lib/libarchive/archive_write_open_fd.c @@ -111,10 +111,15 @@ static ssize_t file_write(struct archive *a, void *client_data, void *buff, size_t length) { struct write_fd_data *mine; + ssize_t bytesWritten; - (void)a; /* UNUSED */ mine = client_data; - return (write(mine->fd, buff, length)); + bytesWritten = write(mine->fd, buff, length); + if (bytesWritten <= 0) { + archive_set_error(a, errno, "Write error"); + return (-1); + } + return (bytesWritten); } static int diff --git a/lib/libarchive/archive_write_open_file.c b/lib/libarchive/archive_write_open_file.c index cfce0a593da..71a77b8b2a2 100644 --- a/lib/libarchive/archive_write_open_file.c +++ b/lib/libarchive/archive_write_open_file.c @@ -135,10 +135,15 @@ static ssize_t file_write(struct archive *a, void *client_data, void *buff, size_t length) { struct write_file_data *mine; + ssize_t bytesWritten; - (void)a; /* UNUSED */ mine = client_data; - return (write(mine->fd, buff, length)); + bytesWritten = write(mine->fd, buff, length); + if (bytesWritten <= 0) { + archive_set_error(a, errno, "Write error"); + return (-1); + } + return (bytesWritten); } static int diff --git a/lib/libarchive/archive_write_open_filename.c b/lib/libarchive/archive_write_open_filename.c index cfce0a593da..71a77b8b2a2 100644 --- a/lib/libarchive/archive_write_open_filename.c +++ b/lib/libarchive/archive_write_open_filename.c @@ -135,10 +135,15 @@ static ssize_t file_write(struct archive *a, void *client_data, void *buff, size_t length) { struct write_file_data *mine; + ssize_t bytesWritten; - (void)a; /* UNUSED */ mine = client_data; - return (write(mine->fd, buff, length)); + bytesWritten = write(mine->fd, buff, length); + if (bytesWritten <= 0) { + archive_set_error(a, errno, "Write error"); + return (-1); + } + return (bytesWritten); } static int