From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 15 Jan 2012 08:08:41 +0000 (-0500)
Subject: Simply, read Mac metadata only when enable_copyfile is true.
X-Git-Tag: v3.0.4~2^2~185
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80d394e5788dfeeeaa274741aeac05cc2a4ea374;p=thirdparty%2Flibarchive.git

Simply, read Mac metadata only when enable_copyfile is true.

SVN-Revision: 4153
---

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index 4d639483c..eef42ef74 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -235,9 +235,11 @@ archive_read_disk_entry_from_file(struct archive *_a,
 	r1 = setup_xattrs(a, entry, fd);
 	if (r1 < r)
 		r = r1;
-	r1 = setup_mac_metadata(a, entry, fd);
-	if (r1 < r)
-		r = r1;
+	if (a->enable_copyfile) {
+		r1 = setup_mac_metadata(a, entry, fd);
+		if (r1 < r)
+			r = r1;
+	}
 	r1 = setup_sparse(a, entry, fd);
 	if (r1 < r)
 		r = r1;
diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index ea5ce5032..f296bb8ce 100644
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -1058,13 +1058,6 @@ next_entry:
 	if (fd >= 0)
 		close(fd);
 
-#ifdef __APPLE__
-	if (!a->enable_copyfile) {
-		/* If we aren't using copyfile, drop the copyfile() data. */
-		archive_entry_copy_mac_metadata(entry, NULL, 0);
-	}
-#endif
-
 	/* Return to the initial directory. */
 	tree_enter_initial_dir(t);
 	archive_entry_copy_sourcepath(entry, tree_current_path(t));