diff options
author | Tim Kientzle <kientzle@gmail.com> | 2010-05-31 14:20:46 -0400 |
---|---|---|
committer | Tim Kientzle <kientzle@gmail.com> | 2010-05-31 14:20:46 -0400 |
commit | 55aec9a7b8f5a2b32a8dd6faa3cb2d24f10ce05c (patch) | |
tree | 72fd39eb462cbc72f9eb4c77f61c467fab232ff0 /libarchive/archive_write_open_filename.c | |
parent | 571f1fb8fc66a489e6c5a362b4085705dc53da31 (diff) | |
download | libarchive-55aec9a7b8f5a2b32a8dd6faa3cb2d24f10ce05c.tar.gz |
Handle EINTR in write calls:
* In low-level writers, just retry after EINTR
* In archive_write, handle short writes by generating additional writes for the remainder of the block.
In particular, this fixes a problem with bsdtar failing if you try to use the SIGINT handler.
SVN-Revision: 2431
Diffstat (limited to 'libarchive/archive_write_open_filename.c')
-rw-r--r-- | libarchive/archive_write_open_filename.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libarchive/archive_write_open_filename.c b/libarchive/archive_write_open_filename.c index 6a9c7781..8a4cd352 100644 --- a/libarchive/archive_write_open_filename.c +++ b/libarchive/archive_write_open_filename.c @@ -142,12 +142,16 @@ file_write(struct archive *a, void *client_data, const void *buff, size_t length ssize_t bytesWritten; mine = (struct write_file_data *)client_data; - bytesWritten = write(mine->fd, buff, length); - if (bytesWritten <= 0) { - archive_set_error(a, errno, "Write error"); - return (-1); + for (;;) { + bytesWritten = write(mine->fd, buff, length); + if (bytesWritten <= 0) { + if (errno == EINTR) + continue; + archive_set_error(a, errno, "Write error"); + return (-1); + } + return (bytesWritten); } - return (bytesWritten); } static int |