MFp4: libarchive 2.5.4b. (Still 'b' until I get a bit more

feedback, but the 2.5 branch is shaping up nicely.)

In addition to many small bug fixes and code improvements:
 * Another iteration of versioning; I think I've got it right now.
 * Portability:  A lot of progress on Windows support (though I'm
   not committing all of the Windows support files to FreeBSD CVS)
 * Explicit tracking of MBS, WCS, and UTF-8 versions of strings
   in archive_entry; the archive_entry routines now correctly return
   NULL only when something is unset, setting NULL properly clears
   string values.  Most charset conversions have been pushed down to
   archive_string.
 * Better handling of charset conversion failure when writing or
   reading UTF-8 headers in pax archives
 * archive_entry_linkify() provides multiple strategies for
   hardlink matching to suit different format expectations
 * More accurate bzip2 format detection
 * Joerg Sonnenberger's extensive improvements to mtree support
 * Rough support for self-extracting ZIP archives.  Not an ideal
   approach, but it works for the archives I've tried.
 * New "sparsify" option in archive_write_disk converts blocks of nulls
   into seeks.
 * Better default behavior for the test harness; it now reports
   all failures by default instead of coredumping at the first one.

1 files changed, 1 insertions, 23 deletions

diff --git a/lib/libarchive/archive_util.c b/lib/libarchive/archive_util.c
index cad14f4..a29be34 100644
--- a/lib/libarchive/archive_util.c
+++ b/lib/libarchive/archive_util.c
@@ -77,32 +77,10 @@ archive_version_number(void)
 	return (ARCHIVE_VERSION_NUMBER);
 }
 
-/*
- * Format a version string of the form "libarchive x.y.z", where x, y,
- * z are the correct parts of the version ID from
- * archive_version_number().
- *
- * I used to do all of this at build time in shell scripts but that
- * proved to be a portability headache.
- */
-
 const char *
 archive_version_string(void)
 {
-	static char buff[128];
-	struct archive_string as;
-	int n;
-
-	if (buff[0] == '\0') {
-		n = archive_version_number();
-		memset(&as, 0, sizeof(as));
-		archive_string_sprintf(&as, "libarchive %d.%d.%d",
-		    n / 1000000, (n / 1000) % 1000, n % 1000);
-		strncpy(buff, as.s, sizeof(buff));
-		buff[sizeof(buff) - 1] = '\0';
-		archive_string_free(&as);
-	}
-	return (buff);
+	return (ARCHIVE_VERSION_STRING);
 }
 
 int