From 22fb266d06517b83026c2f0a99e4a92b5c35efb4 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Sat, 14 Nov 2009 08:48:32 -0500 Subject: [PATCH] use different tar format to handle longer file names --- Source/CPack/cmCPackArchiveGenerator.cxx | 3 +-- Source/cmSystemTools.cxx | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx index e205419d1..ba221a311 100644 --- a/Source/CPack/cmCPackArchiveGenerator.cxx +++ b/Source/CPack/cmCPackArchiveGenerator.cxx @@ -55,8 +55,7 @@ bool SetArchiveType(struct archive* a, { case cmCPackArchiveGenerator::TAR: // maybe this: - //res = archive_write_set_format_pax(a); - res = archive_write_set_format_ustar(a); // is this what we want? + res = archive_write_set_format_pax_restricted(a); break; case cmCPackArchiveGenerator::ZIP: res = archive_write_set_format_zip(a); diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index b16d28aa4..f5fba5c26 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1779,7 +1779,7 @@ bool cmSystemTools::CreateTar(const char* outFileName, res = archive_write_set_compression_none(a); CHECK_ARCHIVE_ERROR(res, "Can not set none:"); } - res = archive_write_set_format_ustar(a); + res = archive_write_set_format_pax_restricted(a); CHECK_ARCHIVE_ERROR(res, "Can not set tar format:"); res = archive_write_open_file(a, outFileName); CHECK_ARCHIVE_ERROR(res, "write open:");