From: Tim Kientzle <kientzle@gmail.com>
Date: Fri, 4 Nov 2011 04:33:28 +0000 (-0400)
Subject: Use the original filename for reporting errors, instead of the processed one.
X-Git-Tag: v3.0.0a~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0161be68cc62ffa10c4e9df9c76a886c489deba1;p=thirdparty%2Flibarchive.git

Use the original filename for reporting errors, instead of the processed one.

SVN-Revision: 3745
---

diff --git a/tar/write.c b/tar/write.c
index 9e0eb7282..7e4fb9a0d 100644
--- a/tar/write.c
+++ b/tar/write.c
@@ -562,9 +562,10 @@ archive_names_from_file(struct bsdtar *bsdtar, struct archive *a)
  */
 static int
 append_archive_filename(struct bsdtar *bsdtar, struct archive *a,
-    const char *filename)
+    const char *raw_filename)
 {
 	struct archive *ina;
+	const char *filename = raw_filename;
 	int rc;
 
 	if (strcmp(filename, "-") == 0)
@@ -583,7 +584,7 @@ append_archive_filename(struct bsdtar *bsdtar, struct archive *a,
 
 	if (rc != ARCHIVE_OK) {
 		lafe_warnc(0, "Error reading archive %s: %s",
-		    filename, archive_error_string(ina));
+		    raw_filename, archive_error_string(ina));
 		bsdtar->return_value = 1;
 	}
 	archive_read_free(ina);