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, 4 insertions, 2 deletions

diff --git a/lib/libarchive/archive_string.c b/lib/libarchive/archive_string.c
index 323b611774f1..0e92836233c6 100644
--- a/lib/libarchive/archive_string.c
+++ b/lib/libarchive/archive_string.c
@@ -32,10 +32,10 @@ __FBSDID("$FreeBSD$");
  * strings while minimizing heap activity.
  */
 
-#include <err.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "archive_private.h"
 #include "archive_string.h"
 
 struct archive_string *
@@ -68,8 +68,10 @@ __archive_string_ensure(struct archive_string *as, size_t s)
 	while (as->buffer_length < s)
 		as->buffer_length *= 2;
 	as->s = realloc(as->s, as->buffer_length);
+	/* TODO: Return null instead and fix up all of our callers to
+	 * handle this correctly. */
 	if (as->s == NULL)
-		errx(1,"Out of memory");
+		__archive_errx(1, "Out of memory");
 	return (as);
 }