Eliminate reliance on non-portable <err.h> by implementing a very

simple errx() function.
Improve behavior when bzlib/zlib are missing by detecting and
issuing an error message on attempts to read gzip/bzip2 compressed
archives.

1 files changed, 10 insertions, 3 deletions

diff --git a/lib/libarchive/archive_read_support_format_tar.c b/lib/libarchive/archive_read_support_format_tar.c
index e91ddc4..ecc42ad 100644
--- a/lib/libarchive/archive_read_support_format_tar.c
+++ b/lib/libarchive/archive_read_support_format_tar.c
@@ -1602,10 +1602,17 @@ UTF8_mbrtowc(wchar_t *pwc, const char *s, size_t n)
                 return ((size_t)-1);
         }
         if (pwc != NULL) {
-		if (wch < WCHAR_MAX)
-			*pwc = (wchar_t)wch;
-		else
+		/* Assign the value to the output; out-of-range values
+		 * just get truncated. */
+		*pwc = (wchar_t)wch;
+#ifdef WCHAR_MAX
+		/*
+		 * If platform has WCHAR_MAX, we can do something
+		 * more sensible with out-of-range values.
+		 */
+		if (wch >= WCHAR_MAX)
 			*pwc = '?';
+#endif
 	}
         return (wch == L'\0' ? 0 : len);
 }