From: Martin Matuska Date: Wed, 6 Mar 2019 23:37:19 +0000 (+0100) Subject: Understand "journal-data", "secdel" and "undel" fflags in star tar archives X-Git-Tag: v3.4.0~109 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d1ada56b860135a6a208297a6def0658c670caf;p=thirdparty%2Flibarchive.git Understand "journal-data", "secdel" and "undel" fflags in star tar archives Issue #1098 --- diff --git a/libarchive/archive_entry.c b/libarchive/archive_entry.c index cbd124f24..15a737c80 100644 --- a/libarchive/archive_entry.c +++ b/libarchive/archive_entry.c @@ -1698,6 +1698,7 @@ static const struct flag { #ifdef UF_NOUNLINK { "nouunlnk", L"nouunlnk", UF_NOUNLINK, 0}, { "nouunlink", L"nouunlink", UF_NOUNLINK, 0}, + { "noundel", L"noundel", UF_NOUNLINK, 0}, #endif #ifdef UF_COMPRESSED { "nocompressed",L"nocompressed", UF_COMPRESSED, 0}, @@ -1708,9 +1709,11 @@ static const struct flag { #if defined(FS_UNRM_FL) { "nouunlink", L"nouunlink", FS_UNRM_FL, 0}, { "nouunlnk", L"nouunlnk", FS_UNRM_FL, 0}, + { "noundel", L"noundel", FS_UNRM_FL, 0}, #elif defined(EXT2_UNRM_FL) { "nouunlink", L"nouunlink", EXT2_UNRM_FL, 0}, { "nouunlnk", L"nouunlnk", EXT2_UNRM_FL, 0}, + { "noundel", L"noundel", EXT2_UNRM_FL, 0}, #endif #if defined(FS_BTREE_FL) @@ -1773,13 +1776,17 @@ static const struct flag { #endif #if defined(FS_JOURNAL_DATA_FL) { "nojournal", L"nojournal", FS_JOURNAL_DATA_FL, 0}, + { "nojournal-data",L"nojournal-data", FS_JOURNAL_DATA_FL, 0}, #elif defined(EXT3_JOURNAL_DATA_FL) { "nojournal", L"nojournal", EXT3_JOURNAL_DATA_FL, 0}, + { "nojournal-data",L"nojournal-data", EXT3_JOURNAL_DATA_FL, 0}, #endif #if defined(FS_SECRM_FL) { "nosecuredeletion",L"nosecuredeletion",FS_SECRM_FL, 0}, + { "nosecdel", L"nosecdel", FS_SECRM_FL, 0}, #elif defined(EXT2_SECRM_FL) { "nosecuredeletion",L"nosecuredeletion",EXT2_SECRM_FL, 0}, + { "nosecdel", L"nosecdel", EXT2_SECRM_FL, 0}, #endif #if defined(FS_SYNC_FL) { "nosync", L"nosync", FS_SYNC_FL, 0},