]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
archive_entry.c: replace spaces with tabs, understand nouunlnk on Linux
authorMartin Matuska <martin@matuska.org>
Wed, 6 Mar 2019 22:53:21 +0000 (23:53 +0100)
committerMartin Matuska <martin@matuska.org>
Wed, 6 Mar 2019 22:54:40 +0000 (23:54 +0100)
libarchive/archive_entry.c

index 5125a2eb284e91b0f58d093ae037a12c45ebbfad..cbd124f24418a738ec8e7412edb77e630cdc5e1c 100644 (file)
@@ -1640,49 +1640,49 @@ static const struct flag {
 } flags[] = {
        /* Preferred (shorter) names per flag first, all prefixed by "no" */
 #ifdef SF_APPEND
-       { "nosappnd",   L"nosappnd",            SF_APPEND,      0 },
-       { "nosappend",  L"nosappend",           SF_APPEND,      0 },
+       { "nosappnd",   L"nosappnd",            SF_APPEND,      0},
+       { "nosappend",  L"nosappend",           SF_APPEND,      0},
 #endif
 #if defined(FS_APPEND_FL)                      /* 'a' */
-       { "nosappnd",   L"nosappnd",            FS_APPEND_FL,   0 },
-       { "nosappend",  L"nosappend",           FS_APPEND_FL,   0 },
+       { "nosappnd",   L"nosappnd",            FS_APPEND_FL,   0},
+       { "nosappend",  L"nosappend",           FS_APPEND_FL,   0},
 #elif defined(EXT2_APPEND_FL)                  /* 'a' */
-       { "nosappnd",   L"nosappnd",            EXT2_APPEND_FL, 0 },
-       { "nosappend",  L"nosappend",           EXT2_APPEND_FL, 0 },
+       { "nosappnd",   L"nosappnd",            EXT2_APPEND_FL, 0},
+       { "nosappend",  L"nosappend",           EXT2_APPEND_FL, 0},
 #endif
 #ifdef SF_ARCHIVED
-       { "noarch",     L"noarch",              SF_ARCHIVED,    0 },
-       { "noarchived", L"noarchived",          SF_ARCHIVED,    0 },
+       { "noarch",     L"noarch",              SF_ARCHIVED,    0},
+       { "noarchived", L"noarchived",          SF_ARCHIVED,    0},
 #endif
 #ifdef SF_IMMUTABLE
-       { "noschg",     L"noschg",              SF_IMMUTABLE,   0 },
-       { "noschange",  L"noschange",           SF_IMMUTABLE,   0 },
-       { "nosimmutable",       L"nosimmutable",        SF_IMMUTABLE,   0 },
+       { "noschg",     L"noschg",              SF_IMMUTABLE,   0},
+       { "noschange",  L"noschange",           SF_IMMUTABLE,   0},
+       { "nosimmutable",       L"nosimmutable",        SF_IMMUTABLE,   0},
 #endif
 #if defined(FS_IMMUTABLE_FL)                   /* 'i' */
-       { "noschg",     L"noschg",              FS_IMMUTABLE_FL,        0 },
-       { "noschange",  L"noschange",           FS_IMMUTABLE_FL,        0 },
-       { "nosimmutable",       L"nosimmutable",        FS_IMMUTABLE_FL,        0 },
+       { "noschg",     L"noschg",              FS_IMMUTABLE_FL,        0},
+       { "noschange",  L"noschange",           FS_IMMUTABLE_FL,        0},
+       { "nosimmutable",       L"nosimmutable",        FS_IMMUTABLE_FL,        0},
 #elif defined(EXT2_IMMUTABLE_FL)               /* 'i' */
-       { "noschg",     L"noschg",              EXT2_IMMUTABLE_FL,      0 },
-       { "noschange",  L"noschange",           EXT2_IMMUTABLE_FL,      0 },
-       { "nosimmutable",       L"nosimmutable",        EXT2_IMMUTABLE_FL,      0 },
+       { "noschg",     L"noschg",              EXT2_IMMUTABLE_FL,      0},
+       { "noschange",  L"noschange",           EXT2_IMMUTABLE_FL,      0},
+       { "nosimmutable",       L"nosimmutable",        EXT2_IMMUTABLE_FL,      0},
 #endif
 #ifdef SF_NOUNLINK
-       { "nosunlnk",   L"nosunlnk",            SF_NOUNLINK,    0 },
-       { "nosunlink",  L"nosunlink",           SF_NOUNLINK,    0 },
+       { "nosunlnk",   L"nosunlnk",            SF_NOUNLINK,    0},
+       { "nosunlink",  L"nosunlink",           SF_NOUNLINK,    0},
 #endif
 #ifdef SF_SNAPSHOT
-       { "nosnapshot", L"nosnapshot",  SF_SNAPSHOT,    0 },
+       { "nosnapshot", L"nosnapshot",  SF_SNAPSHOT,    0},
 #endif
 #ifdef UF_APPEND
-       { "nouappnd",   L"nouappnd",            UF_APPEND,      0 },
-       { "nouappend",  L"nouappend",           UF_APPEND,      0 },
+       { "nouappnd",   L"nouappnd",            UF_APPEND,      0},
+       { "nouappend",  L"nouappend",           UF_APPEND,      0},
 #endif
 #ifdef UF_IMMUTABLE
-       { "nouchg",     L"nouchg",              UF_IMMUTABLE,   0 },
-       { "nouchange",  L"nouchange",           UF_IMMUTABLE,   0 },
-       { "nouimmutable",       L"nouimmutable",        UF_IMMUTABLE,   0 },
+       { "nouchg",     L"nouchg",              UF_IMMUTABLE,   0},
+       { "nouchange",  L"nouchange",           UF_IMMUTABLE,   0},
+       { "nouimmutable",       L"nouimmutable",        UF_IMMUTABLE,   0},
 #endif
 #ifdef UF_NODUMP
        { "nodump",     L"nodump",              0,              UF_NODUMP},
@@ -1693,137 +1693,139 @@ static const struct flag {
        { "nodump",     L"nodump",              0,              EXT2_NODUMP_FL},
 #endif
 #ifdef UF_OPAQUE
-       { "noopaque",   L"noopaque",            UF_OPAQUE,      0 },
+       { "noopaque",   L"noopaque",            UF_OPAQUE,      0},
 #endif
 #ifdef UF_NOUNLINK
-       { "nouunlnk",   L"nouunlnk",            UF_NOUNLINK,    0 },
-       { "nouunlink",  L"nouunlink",           UF_NOUNLINK,    0 },
+       { "nouunlnk",   L"nouunlnk",            UF_NOUNLINK,    0},
+       { "nouunlink",  L"nouunlink",           UF_NOUNLINK,    0},
 #endif
 #ifdef UF_COMPRESSED
-       { "nocompressed",L"nocompressed",       UF_COMPRESSED,  0 },
+       { "nocompressed",L"nocompressed",       UF_COMPRESSED,  0},
 #endif
 #ifdef UF_HIDDEN
-       { "nohidden",   L"nohidden",            UF_HIDDEN,      0 },
+       { "nohidden",   L"nohidden",            UF_HIDDEN,      0},
 #endif
 #if defined(FS_UNRM_FL)
-        { "nouunlink", L"nouunlink",           FS_UNRM_FL,     0},
+       { "nouunlink",  L"nouunlink",           FS_UNRM_FL,     0},
+       { "nouunlnk",   L"nouunlnk",            FS_UNRM_FL,     0},
 #elif defined(EXT2_UNRM_FL)
-        { "nouunlink", L"nouunlink",           EXT2_UNRM_FL,   0},
+       { "nouunlink",  L"nouunlink",           EXT2_UNRM_FL,   0},
+       { "nouunlnk",   L"nouunlnk",            EXT2_UNRM_FL,   0},
 #endif
 
 #if defined(FS_BTREE_FL)
-        { "nobtree",   L"nobtree",             FS_BTREE_FL,    0 },
+       { "nobtree",    L"nobtree",             FS_BTREE_FL,    0},
 #elif defined(EXT2_BTREE_FL)
-        { "nobtree",   L"nobtree",             EXT2_BTREE_FL,  0 },
+       { "nobtree",    L"nobtree",             EXT2_BTREE_FL,  0},
 #endif
 
 #if defined(FS_ECOMPR_FL)
-        { "nocomperr", L"nocomperr",           FS_ECOMPR_FL,   0 },
+       { "nocomperr",  L"nocomperr",           FS_ECOMPR_FL,   0},
 #elif defined(EXT2_ECOMPR_FL)
-        { "nocomperr", L"nocomperr",           EXT2_ECOMPR_FL, 0 },
+       { "nocomperr",  L"nocomperr",           EXT2_ECOMPR_FL, 0},
 #endif
 
 #if defined(FS_COMPR_FL)                       /* 'c' */
-        { "nocompress",        L"nocompress",          FS_COMPR_FL,    0 },
+       { "nocompress", L"nocompress",          FS_COMPR_FL,    0},
 #elif defined(EXT2_COMPR_FL)                   /* 'c' */
-        { "nocompress",        L"nocompress",          EXT2_COMPR_FL,  0 },
+       { "nocompress", L"nocompress",          EXT2_COMPR_FL,  0},
 #endif
 
 #if defined(FS_NOATIME_FL)                     /* 'A' */
-        { "noatime",   L"noatime",             0,              FS_NOATIME_FL},
+       { "noatime",    L"noatime",             0,              FS_NOATIME_FL},
 #elif defined(EXT2_NOATIME_FL)                 /* 'A' */
-        { "noatime",   L"noatime",             0,              EXT2_NOATIME_FL},
+       { "noatime",    L"noatime",             0,              EXT2_NOATIME_FL},
 #endif
 
 #if defined(FS_DIRTY_FL)
-        { "nocompdirty",L"nocompdirty",                FS_DIRTY_FL,            0},
+       { "nocompdirty",L"nocompdirty",         FS_DIRTY_FL,            0},
 #elif defined(EXT2_DIRTY_FL)
-        { "nocompdirty",L"nocompdirty",                EXT2_DIRTY_FL,          0},
+       { "nocompdirty",L"nocompdirty",         EXT2_DIRTY_FL,          0},
 #endif
 
 #if defined(FS_COMPRBLK_FL)
 #if defined(FS_NOCOMPR_FL)
-        { "nocomprblk",        L"nocomprblk",          FS_COMPRBLK_FL, FS_NOCOMPR_FL},
+       { "nocomprblk", L"nocomprblk",          FS_COMPRBLK_FL, FS_NOCOMPR_FL},
 #else
-        { "nocomprblk",        L"nocomprblk",          FS_COMPRBLK_FL, 0},
+       { "nocomprblk", L"nocomprblk",          FS_COMPRBLK_FL, 0},
 #endif
 #elif defined(EXT2_COMPRBLK_FL)
 #if defined(EXT2_NOCOMPR_FL)
-        { "nocomprblk",        L"nocomprblk",          EXT2_COMPRBLK_FL, EXT2_NOCOMPR_FL},
+       { "nocomprblk", L"nocomprblk",          EXT2_COMPRBLK_FL, EXT2_NOCOMPR_FL},
 #else
-        { "nocomprblk",        L"nocomprblk",          EXT2_COMPRBLK_FL,       0},
+       { "nocomprblk", L"nocomprblk",          EXT2_COMPRBLK_FL,       0},
 #endif
 #endif
 #if defined(FS_DIRSYNC_FL)
-        { "nodirsync", L"nodirsync",           FS_DIRSYNC_FL,  0},
+       { "nodirsync",  L"nodirsync",           FS_DIRSYNC_FL,  0},
 #elif defined(EXT2_DIRSYNC_FL)
-        { "nodirsync", L"nodirsync",           EXT2_DIRSYNC_FL,        0},
+       { "nodirsync",  L"nodirsync",           EXT2_DIRSYNC_FL,        0},
 #endif
 #if defined(FS_INDEX_FL)
-        { "nohashidx", L"nohashidx",           FS_INDEX_FL,            0},
+       { "nohashidx",  L"nohashidx",           FS_INDEX_FL,            0},
 #elif defined(EXT2_INDEX_FL)
-        { "nohashidx", L"nohashidx",           EXT2_INDEX_FL,          0},
+       { "nohashidx",  L"nohashidx",           EXT2_INDEX_FL,          0},
 #endif
 #if defined(FS_IMAGIC_FL)
-        { "noimagic",  L"noimagic",            FS_IMAGIC_FL,           0},
+       { "noimagic",   L"noimagic",            FS_IMAGIC_FL,           0},
 #elif defined(EXT2_IMAGIC_FL)
-        { "noimagic",  L"noimagic",            EXT2_IMAGIC_FL,         0},
+       { "noimagic",   L"noimagic",            EXT2_IMAGIC_FL,         0},
 #endif
 #if defined(FS_JOURNAL_DATA_FL)
-        { "nojournal", L"nojournal",           FS_JOURNAL_DATA_FL,     0},
+       { "nojournal",  L"nojournal",           FS_JOURNAL_DATA_FL,     0},
 #elif defined(EXT3_JOURNAL_DATA_FL)
-        { "nojournal", L"nojournal",           EXT3_JOURNAL_DATA_FL,   0},
+       { "nojournal",  L"nojournal",           EXT3_JOURNAL_DATA_FL,   0},
 #endif
 #if defined(FS_SECRM_FL)
-        { "nosecuredeletion",L"nosecuredeletion",FS_SECRM_FL,          0},
+       { "nosecuredeletion",L"nosecuredeletion",FS_SECRM_FL,           0},
 #elif defined(EXT2_SECRM_FL)
-        { "nosecuredeletion",L"nosecuredeletion",EXT2_SECRM_FL,                0},
+       { "nosecuredeletion",L"nosecuredeletion",EXT2_SECRM_FL,         0},
 #endif
 #if defined(FS_SYNC_FL)
-        { "nosync",    L"nosync",              FS_SYNC_FL,             0},
+       { "nosync",     L"nosync",              FS_SYNC_FL,             0},
 #elif defined(EXT2_SYNC_FL)
-        { "nosync",    L"nosync",              EXT2_SYNC_FL,           0},
+       { "nosync",     L"nosync",              EXT2_SYNC_FL,           0},
 #endif
 #if defined(FS_NOTAIL_FL)
-        { "notail",    L"notail",              0,              FS_NOTAIL_FL},
+       { "notail",     L"notail",              0,              FS_NOTAIL_FL},
 #elif defined(EXT2_NOTAIL_FL)
-        { "notail",    L"notail",              0,              EXT2_NOTAIL_FL},
+       { "notail",     L"notail",              0,              EXT2_NOTAIL_FL},
 #endif
 #if defined(FS_TOPDIR_FL)
-        { "notopdir",  L"notopdir",            FS_TOPDIR_FL,           0},
+       { "notopdir",   L"notopdir",            FS_TOPDIR_FL,           0},
 #elif defined(EXT2_TOPDIR_FL)
-        { "notopdir",  L"notopdir",            EXT2_TOPDIR_FL,         0},
+       { "notopdir",   L"notopdir",            EXT2_TOPDIR_FL,         0},
 #endif
 #ifdef FS_ENCRYPT_FL
-        { "noencrypt", L"noencrypt",           FS_ENCRYPT_FL,  0},
+       { "noencrypt",  L"noencrypt",           FS_ENCRYPT_FL,  0},
 #endif
 #ifdef FS_HUGE_FILE_FL
-        { "nohugefile",        L"nohugefile",          FS_HUGE_FILE_FL,        0},
+       { "nohugefile", L"nohugefile",          FS_HUGE_FILE_FL,        0},
 #endif
 #ifdef FS_EXTENT_FL
-        { "noextent",  L"noextent",            FS_EXTENT_FL,   0},
+       { "noextent",   L"noextent",            FS_EXTENT_FL,   0},
 #endif
 #ifdef FS_EA_INODE_FL
-        { "noeainode", L"noeainode",           FS_EA_INODE_FL, 0},
+       { "noeainode",  L"noeainode",           FS_EA_INODE_FL, 0},
 #endif
 #ifdef FS_EOFBLOCKS_FL
-        { "noeofblocks",L"noeofblocks",                FS_EOFBLOCKS_FL,        0},
+       { "noeofblocks",L"noeofblocks",         FS_EOFBLOCKS_FL,        0},
 #endif
 #ifdef FS_NOCOW_FL
-        { "nocow",     L"nocow",               FS_NOCOW_FL,    0},
+       { "nocow",      L"nocow",               FS_NOCOW_FL,    0},
 #endif
 #ifdef FS_INLINE_DATA_FL
-        { "noinlinedata",L"noinlinedata",      FS_INLINE_DATA_FL,      0},
+       { "noinlinedata",L"noinlinedata",       FS_INLINE_DATA_FL,      0},
 #endif
 #ifdef FS_PROJINHERIT_FL
-        { "noprojinherit",L"noprojinherit",    FS_PROJINHERIT_FL,      0},
+       { "noprojinherit",L"noprojinherit",     FS_PROJINHERIT_FL,      0},
 #endif
 #if defined(FS_RESERVED_FL)
-        { "noreserved",        L"noreserved",          FS_RESERVED_FL, 0},
+       { "noreserved", L"noreserved",          FS_RESERVED_FL, 0},
 #elif defined(EXT2_RESERVED_FL)
-        { "noreserved",        L"noreserved",          EXT2_RESERVED_FL,       0},
+       { "noreserved", L"noreserved",          EXT2_RESERVED_FL,       0},
 #endif
-       { NULL,         NULL,                   0,              0 }
+       { NULL,         NULL,                   0,              0}
 };
 
 /*