tar: make error reporting more robust and use correct errno (#2101)

As discussed in #1609.

diff --git a/tar/read.c b/tar/read.c
index af3d3f423daff024791465bb9976a9b9a74b91ad..a7f14a07bb35602256b732cf3de96892e4280523 100644 (file)
--- a/tar/read.c
+++ b/tar/read.c
@@ -371,8 +371,9 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer)
                        if (r != ARCHIVE_OK) {
                                if (!bsdtar->verbose)
                                        safe_fprintf(stderr, "%s", archive_entry_pathname(entry));
-                               fprintf(stderr, ": %s: ", archive_error_string(a));
-                               fprintf(stderr, "%s", strerror(errno));
+                               safe_fprintf(stderr, ": %s: %s",
+                                   archive_error_string(a),
+                                   strerror(archive_errno(a)));
                                if (!bsdtar->verbose)
                                        fprintf(stderr, "\n");
                                bsdtar->return_value = 1;