Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add --nopreserveHFSCompression option to bsdtar to prevent

a file which was compressed before archived from automatically
HFS+ Compression.
  • Loading branch information...
commit 6238bed625a8292852a347e7cea53cb06b800538 1 parent cb02c0f
@ggcueroad ggcueroad authored
View
2  Makefile.am
@@ -418,6 +418,7 @@ libarchive_test_SOURCES= \
libarchive/test/test_write_disk_hardlink.c \
libarchive/test/test_write_disk_hfs_compression.c \
libarchive/test/test_write_disk_lookup.c \
+ libarchive/test/test_write_disk_no_hfs_compression.c \
libarchive/test/test_write_disk_perms.c \
libarchive/test/test_write_disk_secure.c \
libarchive/test/test_write_disk_sparse.c \
@@ -652,6 +653,7 @@ libarchive_test_EXTRA_DIST=\
libarchive/test/test_splitted_rar_seek_support_ab.uu \
libarchive/test/test_splitted_rar_seek_support_ac.uu \
libarchive/test/test_write_disk_hfs_compression.tgz.uu \
+ libarchive/test/test_write_disk_no_hfs_compression.tgz.uu \
libarchive/test/CMakeLists.txt \
libarchive/test/README
View
7 libarchive/archive.h
@@ -545,9 +545,12 @@ __LA_DECL int archive_read_set_options(struct archive *_a,
/* Default: Do not restore Mac extended metadata. */
/* This has no effect except on Mac OS. */
#define ARCHIVE_EXTRACT_MAC_METADATA (0x2000)
-/* Default: Do not use HFS+ compression. */
+/* Default: Use HFS+ compression if it was compressed. */
/* This has no effect except on Mac OS v10.6 or later. */
-#define ARCHIVE_EXTRACT_HFS_COMPRESSION (0x4000)
+#define ARCHIVE_EXTRACT_NO_HFS_COMPRESSION (0x4000)
+/* Default: Do not use HFS+ compression if it was not compressed. */
+/* This has no effect except on Mac OS v10.6 or later. */
+#define ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED (0x8000)
__LA_DECL int archive_read_extract(struct archive *, struct archive_entry *,
int flags);
View
3  libarchive/archive_entry.c
@@ -1449,6 +1449,9 @@ static struct flag {
{ "nouunlnk", L"nouunlnk", UF_NOUNLINK, 0 },
{ "nouunlink", L"nouunlink", UF_NOUNLINK, 0 },
#endif
+#ifdef UF_COMPRESSED
+ { "nocompressed",L"nocompressed", UF_COMPRESSED, 0 },
+#endif
#ifdef EXT2_UNRM_FL
{ "nouunlink", L"nouunlink", EXT2_UNRM_FL, 0},
#endif
View
15 libarchive/archive_write_disk_posix.c
@@ -186,7 +186,7 @@ struct fixup_entry {
#define TODO_ACLS ARCHIVE_EXTRACT_ACL
#define TODO_XATTR ARCHIVE_EXTRACT_XATTR
#define TODO_MAC_METADATA ARCHIVE_EXTRACT_MAC_METADATA
-#define TODO_HFS_COMPRESSION ARCHIVE_EXTRACT_HFS_COMPRESSION
+#define TODO_HFS_COMPRESSION ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED
struct archive_write_disk {
struct archive archive;
@@ -548,11 +548,22 @@ _archive_write_disk_header(struct archive *_a, struct archive_entry *entry)
else
a->todo |= TODO_MAC_METADATA;
}
- if ((a->flags & ARCHIVE_EXTRACT_HFS_COMPRESSION) != 0 &&
+#if defined(UF_COMPRESSED)
+ if ((a->flags & ARCHIVE_EXTRACT_NO_HFS_COMPRESSION) == 0) {
+ unsigned long set, clear;
+ archive_entry_fflags(a->entry, &set, &clear);
+ if ((set & ~clear) & UF_COMPRESSED) {
+ a->todo |= TODO_HFS_COMPRESSION | TODO_FFLAGS;
+ a->decmpfs_block_count = (unsigned)-1;
+ }
+ }
+ if ((a->flags & ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED) != 0 &&
(a->mode & AE_IFMT) == AE_IFREG && a->filesize > 0) {
a->todo |= TODO_HFS_COMPRESSION | TODO_FFLAGS;
a->decmpfs_block_count = (unsigned)-1;
}
+#endif
+
if (a->flags & ARCHIVE_EXTRACT_XATTR)
a->todo |= TODO_XATTR;
if (a->flags & ARCHIVE_EXTRACT_FFLAGS)
View
1  libarchive/test/CMakeLists.txt
@@ -153,6 +153,7 @@ IF(ENABLE_TEST)
test_write_disk_hardlink.c
test_write_disk_hfs_compression.c
test_write_disk_lookup.c
+ test_write_disk_no_hfs_compression.c
test_write_disk_perms.c
test_write_disk_secure.c
test_write_disk_sparse.c
View
2  libarchive/test/test_write_disk_hfs_compression.c
@@ -92,7 +92,7 @@ DEFINE_TEST(test_write_disk_hfs_compression)
ARCHIVE_EXTRACT_TIME |
ARCHIVE_EXTRACT_SECURE_SYMLINKS |
ARCHIVE_EXTRACT_SECURE_NODOTDOT |
- ARCHIVE_EXTRACT_HFS_COMPRESSION));
+ ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED));
assert((a = archive_read_new()) != NULL);
assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
View
229 libarchive/test/test_write_disk_no_hfs_compression.c
@@ -0,0 +1,229 @@
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * Copyright (c) 2012 Michihiro NAKAJIMA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+__FBSDID("$FreeBSD$");
+
+#ifdef HAVE_SYS_XATTR_H
+#include <sys/xattr.h>
+#endif
+
+#if defined(__APPLE__) && defined(UF_COMPRESSED)
+static int
+has_xattr(const char *filename, const char *xattrname)
+{
+ char *nl, *nlp;
+ ssize_t r;
+ int exisiting;
+
+ r = listxattr(filename, NULL, 0, XATTR_SHOWCOMPRESSION);
+ if (r < 0)
+ return (0);
+ if (r == 0)
+ return (0);
+
+ nl = malloc(r);
+ if (!assert(nl != NULL))
+ return (0);
+
+ r = listxattr(filename, nl, r, XATTR_SHOWCOMPRESSION);
+ if (r < 0) {
+ free(nl);
+ return (0);
+ }
+
+ exisiting = 0;
+ for (nlp = nl; nlp < nl + r; nlp += strlen(nlp) + 1) {
+ if (strcmp(nlp, xattrname) == 0) {
+ exisiting = 1;
+ break;
+ }
+ }
+ free(nl);
+ return (exisiting);
+}
+#endif
+
+/*
+ * Exercise HFS+ Compression.
+ */
+DEFINE_TEST(test_write_disk_no_hfs_compression)
+{
+#if !defined(__APPLE__) || !defined(UF_COMPRESSED)
+ skipping("MacOS-specific HFS+ Compression test");
+#else
+ const char *refname = "test_write_disk_no_hfs_compression.tgz";
+ struct archive *ad, *a;
+ struct archive_entry *ae;
+ struct stat st;
+
+ extract_reference_file(refname);
+
+ /*
+ * Extract an archive to disk with HFS+ Compression
+ * the file was compressed.
+ */
+ assert((ad = archive_write_disk_new()) != NULL);
+ assertEqualIntA(ad, ARCHIVE_OK,
+ archive_write_disk_set_standard_lookup(ad));
+ assertEqualIntA(ad, ARCHIVE_OK,
+ archive_write_disk_set_options(ad,
+ ARCHIVE_EXTRACT_TIME |
+ ARCHIVE_EXTRACT_SECURE_SYMLINKS |
+ ARCHIVE_EXTRACT_SECURE_NODOTDOT));
+
+ assert((a = archive_read_new()) != NULL);
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a,
+ refname, 512 * 20));
+
+ assertMakeDir("hfscmp", 0755);
+ assertChdir("hfscmp");
+
+ /* Extract file1. */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+ /* Extract README. */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+ /* Extract NEWS. */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+ /* Extract Makefile. */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+
+ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+ assertEqualIntA(ad, ARCHIVE_OK, archive_write_free(ad));
+
+ /* Test file1. */
+ assertEqualInt(0, stat("file1", &st));
+ assertEqualInt(0, st.st_flags & UF_COMPRESSED);
+ assertFileSize("file1", 8);
+ assertEqualInt(0, has_xattr("file1", "com.apple.ResourceFork"));
+ assertEqualInt(0, has_xattr("file1", "com.apple.decmpfs"));
+
+ /* Test README. */
+ assertEqualInt(0, stat("README", &st));
+ assertEqualInt(UF_COMPRESSED, st.st_flags & UF_COMPRESSED);
+ assertFileSize("README", 6586);
+ assertEqualInt(0, has_xattr("README", "com.apple.ResourceFork"));
+ assertEqualInt(1, has_xattr("README", "com.apple.decmpfs"));
+
+ /* Test NEWS. */
+ assertEqualInt(0, stat("NEWS", &st));
+ assertEqualInt(0, st.st_flags & UF_COMPRESSED);
+ assertFileSize("NEWS", 28438);
+ assertEqualInt(0, has_xattr("NEWS", "com.apple.ResourceFork"));
+ assertEqualInt(0, has_xattr("NEWS", "com.apple.decmpfs"));
+
+ /* Test Makefile. */
+ assertEqualInt(0, stat("Makefile", &st));
+ assertEqualInt(UF_COMPRESSED, st.st_flags & UF_COMPRESSED);
+ assertFileSize("Makefile", 1238119);
+ assertEqualInt(1, has_xattr("Makefile", "com.apple.ResourceFork"));
+ assertEqualInt(1, has_xattr("Makefile", "com.apple.decmpfs"));
+
+ assertChdir("..");
+
+ /*
+ * Extract an archive to disk without HFS+ Compression.
+ */
+ assert((ad = archive_write_disk_new()) != NULL);
+ assertEqualIntA(ad, ARCHIVE_OK,
+ archive_write_disk_set_standard_lookup(ad));
+ assertEqualIntA(ad, ARCHIVE_OK,
+ archive_write_disk_set_options(ad,
+ ARCHIVE_EXTRACT_TIME |
+ ARCHIVE_EXTRACT_SECURE_SYMLINKS |
+ ARCHIVE_EXTRACT_SECURE_NODOTDOT |
+ ARCHIVE_EXTRACT_NO_HFS_COMPRESSION));
+
+ assert((a = archive_read_new()) != NULL);
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a,
+ refname, 512 * 20));
+
+ assertMakeDir("nocmp", 0755);
+ assertChdir("nocmp");
+
+ /* Extract file1. */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+ /* Extract README. */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+ /* Extract NEWS. */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+ /* Extract Makefile. */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+
+ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+ assertEqualIntA(ad, ARCHIVE_OK, archive_write_free(ad));
+
+ /* Test file1. */
+ assertEqualInt(0, stat("file1", &st));
+ assertEqualInt(0, st.st_flags & UF_COMPRESSED);
+ assertFileSize("file1", 8);
+ assertEqualInt(0, has_xattr("file1", "com.apple.ResourceFork"));
+ assertEqualInt(0, has_xattr("file1", "com.apple.decmpfs"));
+
+ /* Test README. */
+ assertEqualInt(0, stat("README", &st));
+ assertEqualInt(0, st.st_flags & UF_COMPRESSED);
+ assertFileSize("README", 6586);
+ assertEqualInt(0, has_xattr("README", "com.apple.ResourceFork"));
+ assertEqualInt(0, has_xattr("README", "com.apple.decmpfs"));
+
+ /* Test NEWS. */
+ assertEqualInt(0, stat("NEWS", &st));
+ assertEqualInt(0, st.st_flags & UF_COMPRESSED);
+ assertFileSize("NEWS", 28438);
+ assertEqualInt(0, has_xattr("NEWS", "com.apple.ResourceFork"));
+ assertEqualInt(0, has_xattr("NEWS", "com.apple.decmpfs"));
+
+ /* Test Makefile. */
+ assertEqualInt(0, stat("Makefile", &st));
+ assertEqualInt(0, st.st_flags & UF_COMPRESSED);
+ assertFileSize("Makefile", 1238119);
+ assertEqualInt(0, has_xattr("Makefile", "com.apple.ResourceFork"));
+ assertEqualInt(0, has_xattr("Makefile", "com.apple.decmpfs"));
+
+ assertChdir("..");
+
+ assertEqualFile("hfscmp/file1", "nocmp/file1");
+ assertEqualFile("hfscmp/README", "nocmp/README");
+ assertEqualFile("hfscmp/NEWS", "nocmp/NEWS");
+ assertEqualFile("hfscmp/Makefile", "nocmp/Makefile");
+#endif
+}
View
1,765 libarchive/test/test_write_disk_no_hfs_compression.tgz.uu
1,765 additions, 0 deletions not shown
View
7 tar/bsdtar.1
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 23, 2012
+.Dd October 31, 2012
.Dt TAR 1
.Os
.Sh NAME
@@ -356,6 +356,11 @@ except it compares mtime entries instead of ctime entries.
.It Fl Fl nodump
(c and r modes only)
Honor the nodump file flag by skipping this file.
+.It Fl Fl nopreserveHFSCompression
+(x mode only)
+Mac OS X specific(v10.6 or later). Do not compress extracted regular files
+which were compressed with HFS+ compression before archived.
+By default, compress the regular files again with HFS+ compression.
.It Fl Fl null
(use with
.Fl I
View
12 tar/bsdtar.c
@@ -349,7 +349,8 @@ main(int argc, char **argv)
exit(0);
break;
case OPTION_HFS_COMPRESSION: /* Mac OS X v10.6 or later */
- bsdtar->extract_flags |= ARCHIVE_EXTRACT_HFS_COMPRESSION;
+ bsdtar->extract_flags |=
+ ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED;
break;
case 'I': /* GNU tar */
/*
@@ -464,6 +465,11 @@ main(int argc, char **argv)
case OPTION_NODUMP: /* star */
bsdtar->readdisk_flags |= ARCHIVE_READDISK_HONOR_NODUMP;
break;
+ case OPTION_NOPRESERVE_HFS_COMPRESSION:
+ /* Mac OS X v10.6 or later */
+ bsdtar->extract_flags |=
+ ARCHIVE_EXTRACT_NO_HFS_COMPRESSION;
+ break;
case OPTION_NO_SAME_OWNER: /* GNU tar */
bsdtar->extract_flags &= ~ARCHIVE_EXTRACT_OWNER;
break;
@@ -700,8 +706,10 @@ main(int argc, char **argv)
only_mode(bsdtar, "--one-file-system", "cru");
if (bsdtar->option_fast_read)
only_mode(bsdtar, "--fast-read", "xt");
- if (bsdtar->extract_flags & ARCHIVE_EXTRACT_HFS_COMPRESSION)
+ if (bsdtar->extract_flags & ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED)
only_mode(bsdtar, "--hfsCompression", "x");
+ if (bsdtar->extract_flags & ARCHIVE_EXTRACT_NO_HFS_COMPRESSION)
+ only_mode(bsdtar, "--nopreserveHFSCompression", "x");
if (bsdtar->readdisk_flags & ARCHIVE_READDISK_HONOR_NODUMP)
only_mode(bsdtar, "--nodump", "cru");
if (option_o > 0) {
View
1  tar/bsdtar.h
@@ -132,6 +132,7 @@ enum {
OPTION_NEWER_MTIME,
OPTION_NEWER_MTIME_THAN,
OPTION_NODUMP,
+ OPTION_NOPRESERVE_HFS_COMPRESSION,
OPTION_NO_SAME_OWNER,
OPTION_NO_SAME_PERMISSIONS,
OPTION_NULL,
View
1  tar/cmdline.c
@@ -115,6 +115,7 @@ static const struct bsdtar_option {
{ "no-same-owner", 0, OPTION_NO_SAME_OWNER },
{ "no-same-permissions", 0, OPTION_NO_SAME_PERMISSIONS },
{ "nodump", 0, OPTION_NODUMP },
+ { "nopreserveHFSCompression",0, OPTION_NOPRESERVE_HFS_COMPRESSION },
{ "norecurse", 0, 'n' },
{ "null", 0, OPTION_NULL },
{ "numeric-owner", 0, OPTION_NUMERIC_OWNER },
Please sign in to comment.
Something went wrong with that request. Please try again.