tar: make error reporting more robust and use correct errno

As discussed in libarchive#1609.
emaste · Mar 29, 2024 · e200fd8 · e200fd8
1 parent 2fb7b0c
commit e200fd8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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;