From: Martin Matuska <martin@matuska.org>
Date: Thu, 23 Feb 2017 11:02:13 +0000 (+0100)
Subject: Add ARCHIVE_READDISK_NO_FFLAGS to suppress reading file flags from disk
X-Git-Tag: v3.3.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=098e477bd6ee09d7067e8b35e987c0a5308fbd79;p=thirdparty%2Flibarchive.git

Add ARCHIVE_READDISK_NO_FFLAGS to suppress reading file flags from disk
---

diff --git a/libarchive/archive.h b/libarchive/archive.h
index 20fa09b1d..e74be4d50 100644
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -1003,6 +1003,8 @@ __LA_DECL int  archive_read_disk_set_atime_restored(struct archive *);
 #define	ARCHIVE_READDISK_NO_XATTR		(0x0010)
 /* Default: ACLs are read from disk. */
 #define	ARCHIVE_READDISK_NO_ACL			(0x0020)
+/* Default: File flags are read from disk. */
+#define	ARCHIVE_READDISK_NO_FFLAGS		(0x0040)
 
 __LA_DECL int  archive_read_disk_set_behavior(struct archive *,
 		    int flags);
diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index 603b70763..b2f1d17d9 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -203,7 +203,7 @@ archive_read_disk_entry_from_file(struct archive *_a,
 #ifdef HAVE_STRUCT_STAT_ST_FLAGS
 	/* On FreeBSD, we get flags for free with the stat. */
 	/* TODO: Does this belong in copy_stat()? */
-	if (st->st_flags != 0)
+	if ((a->flags & ARCHIVE_READDISK_NO_FFLAGS) == 0 && st->st_flags != 0)
 		archive_entry_set_fflags(entry, st->st_flags, 0);
 #endif
 
@@ -212,7 +212,8 @@ archive_read_disk_entry_from_file(struct archive *_a,
 	/* Linux requires an extra ioctl to pull the flags.  Although
 	 * this is an extra step, it has a nice side-effect: We get an
 	 * open file descriptor which we can use in the subsequent lookups. */
-	if ((S_ISREG(st->st_mode) || S_ISDIR(st->st_mode))) {
+	if ((a->flags & ARCHIVE_READDISK_NO_FFLAGS) == 0 &&
+	    (S_ISREG(st->st_mode) || S_ISDIR(st->st_mode))) {
 		if (fd < 0) {
 			if (a->tree != NULL)
 				fd = a->open_on_current_dir(a->tree, path,