From: Tim Kientzle <kientzle@acm.org>
Date: Sat, 28 Jun 2025 21:23:02 +0000 (-0700)
Subject: Merge pull request #2689 from ElvishJerricco/linux-fs-flags
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dafb79b967b0dceaa0168a941536f4d557cc9a75;p=thirdparty%2Flibarchive.git

Merge pull request #2689 from ElvishJerricco/linux-fs-flags

clear_nochange_fflags: Use linux FS flags

(cherry picked from commit 9fe18ba0a644893c94d7b809885b4f32786a88ed)
---

diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
index f15337264..346cde117 100644
--- a/libarchive/archive_write_disk_posix.c
+++ b/libarchive/archive_write_disk_posix.c
@@ -3930,10 +3930,14 @@ clear_nochange_fflags(struct archive_write_disk *a)
 #ifdef UF_APPEND
 	    | UF_APPEND
 #endif
-#ifdef EXT2_APPEND_FL
+#if defined(FS_APPEND_FL)
+	    | FS_APPEND_FL
+#elif defined(EXT2_APPEND_FL)
 	    | EXT2_APPEND_FL
 #endif
-#ifdef EXT2_IMMUTABLE_FL
+#if defined(FS_IMMUTABLE_FL)
+	    | FS_IMMUTABLE_FL
+#elif defined(EXT2_IMMUTABLE_FL)
 	    | EXT2_IMMUTABLE_FL
 #endif
 	;