diff options
| author | kientzle <kientzle@FreeBSD.org> | 2007-04-14 22:49:37 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2007-04-14 22:49:37 +0000 |
| commit | badcfdefb73a22770a4e1a328d5483c50c89cede (patch) | |
| tree | 195b315bcbf72150fcbe568181c269c6a7d69dce | |
| parent | 7cead8e1b5557dab20b40aa5c83b5fabc472d1e3 (diff) | |
| download | FreeBSD-src-badcfdefb73a22770a4e1a328d5483c50c89cede.zip FreeBSD-src-badcfdefb73a22770a4e1a328d5483c50c89cede.tar.gz | |
Pass through error message if any operation fails, not just the last one.
| -rw-r--r-- | lib/libarchive/archive_read_extract.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libarchive/archive_read_extract.c b/lib/libarchive/archive_read_extract.c index c4189f0..2f0ba22 100644 --- a/lib/libarchive/archive_read_extract.c +++ b/lib/libarchive/archive_read_extract.c @@ -100,7 +100,7 @@ archive_read_extract(struct archive *_a, struct archive_entry *entry, int flags) r = copy_data(_a, a->extract->ad); r2 = archive_write_finish_entry(a->extract->ad); /* Use the first message. */ - if (r2 != ARCHIVE_OK && r == ARCHIVE_OK) + if (r2 != ARCHIVE_OK || r != ARCHIVE_OK) archive_set_error(&a->archive, archive_errno(extract->ad), "%s", archive_error_string(extract->ad)); |
