Skip to content

Commit

Permalink
libarchive: backport "make error reporting more robust and use correc…
Browse files Browse the repository at this point in the history
  • Loading branch information
atweiden committed Apr 7, 2024
1 parent 45485d6 commit fc4452c
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
27 changes: 27 additions & 0 deletions srcpkgs/libarchive/patches/fix-error-reporting.patch
@@ -0,0 +1,27 @@
From 6110e9c82d8ba830c3440f36b990483ceaaea52c Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@freebsd.org>
Date: Fri, 29 Mar 2024 18:02:06 -0400
Subject: [PATCH] tar: make error reporting more robust and use correct errno
(#2101)

As discussed in #1609.
---
tar/read.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tar/read.c b/tar/read.c
index af3d3f423daff024791465bb9976a9b9a74b91ad..a7f14a07bb35602256b732cf3de96892e4280523 100644
--- 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;
2 changes: 1 addition & 1 deletion srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
maintainer="nox"
pkgname="libarchive"
version=3.7.2
revision=1
revision=3
short_desc="Library to read/write several different streaming archive formats"
makedepends+=" bzip2-devel"
makedepends+=" liblzma-devel"
Expand Down

0 comments on commit fc4452c

Please sign in to comment.