FHS: Rearrange the matrix

No functional changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/libpakfire/fhs.c b/src/libpakfire/fhs.c
index a4352a65d11fe8c1f52e5bc2aac627c55bdbf0a7..281001abcf249d92cde2274af5b0e1c4169d363b 100644 (file)
--- a/src/libpakfire/fhs.c
+++ b/src/libpakfire/fhs.c
@@ -35,117 +35,117 @@
 static const struct pakfire_fhs_check {
        const char* path;
        const mode_t type;
-       enum pakfire_fhs_check_flags {
-               PAKFIRE_FHS_MUSTNOTEXIST = (1 << 0),
-       } flags;
        const mode_t perms;
        const char* uname;
        const char* gname;
+       enum pakfire_fhs_check_flags {
+               PAKFIRE_FHS_MUSTNOTEXIST = (1 << 0),
+       } flags;
 } pakfire_fhs_check[] = {
        // /usr
-       { "/usr",         S_IFDIR, 0, 0755, "root", "root" },
-       { "/usr/bin",     S_IFDIR, 0, 0755, "root", "root" },
-       { "/usr/include", S_IFDIR, 0, 0755, "root", "root" },
-       { "/usr/lib",     S_IFDIR, 0, 0755, "root", "root" },
-       { "/usr/lib64",   S_IFDIR, 0, 0755, "root", "root" },
-       { "/usr/sbin",    S_IFDIR, 0, 0755, "root", "root" },
-       { "/usr/share",   S_IFDIR, 0, 0755, "root", "root" },
-       { "/usr/src",     S_IFDIR, 0, 0755, "root", "root" },
+       { "/usr",           S_IFDIR, 0755, "root", "root", 0 },
+       { "/usr/bin",       S_IFDIR, 0755, "root", "root", 0 },
+       { "/usr/include",   S_IFDIR, 0755, "root", "root", 0 },
+       { "/usr/lib",       S_IFDIR, 0755, "root", "root", 0 },
+       { "/usr/lib64",     S_IFDIR, 0755, "root", "root", 0 },
+       { "/usr/sbin",      S_IFDIR, 0755, "root", "root", 0 },
+       { "/usr/share",     S_IFDIR, 0755, "root", "root", 0 },
+       { "/usr/src",       S_IFDIR, 0755, "root", "root", 0 },
 
        // Allow no further files in /usr & /usr/src
-       { "/usr/*",       0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
-       { "/usr/src/**",  0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
+       { "/usr/*",               0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
+       { "/usr/src/**",          0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
 
        // There cannot be any subdirectories in /usr/bin & /usr/sbin
-       { "/usr/bin/*",   S_IFDIR, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
-       { "/usr/sbin/*",  S_IFDIR, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
+       { "/usr/bin/*",      S_IFDIR,   0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
+       { "/usr/sbin/*",     S_IFDIR,   0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
 
        // Any files in /usr/{,s}bin must be owned by root and have 0755
-       { "/usr/bin/*",   S_IFREG, 0, 0755, "root", "root" },
-       { "/usr/sbin/*",  S_IFREG, 0, 0755, "root", "root" },
+       { "/usr/bin/*",      S_IFREG, 0755, "root", "root", 0 },
+       { "/usr/sbin/*",     S_IFREG, 0755, "root", "root", 0 },
 
        // /usr/include: Ensure that:
        //   * All files are non-executable and belong to root
        //   * All directories have 0755 and belong to root
-       { "/usr/include/**", S_IFREG, 0, 0644, "root", "root" },
-       { "/usr/include/**", S_IFDIR, 0, 0755, "root", "root" },
+       { "/usr/include/**", S_IFREG, 0644, "root", "root", 0 },
+       { "/usr/include/**", S_IFDIR, 0755, "root", "root", 0 },
 
        // /var
-       { "/var",         S_IFDIR, 0, 0755, "root", "root" },
-       { "/var/cache",   S_IFDIR, 0, 0755, "root", "root" },
-       { "/var/db",      S_IFDIR, 0, 0755, "root", "root" },
-       { "/var/empty",   S_IFDIR, 0, 0755, "root", "root" },
-       { "/var/lib",     S_IFDIR, 0, 0755, "root", "root" },
-       { "/var/log",     S_IFDIR, 0, 0755, "root", "root" },
-       { "/var/mail",    S_IFDIR, 0, 0755, "root", "root" },
-       { "/var/opt",     S_IFDIR, 0, 0755, "root", "root" },
-       { "/var/run",     S_IFLNK, 0, 0755, "root", "root" },
-       { "/var/spool",   S_IFDIR, 0, 0755, "root", "root" },
-       { "/var/tmp",     S_IFDIR, 0, 0755, "root", "root" },
+       { "/var",            S_IFDIR, 0755, "root", "root", 0 },
+       { "/var/cache",      S_IFDIR, 0755, "root", "root", 0 },
+       { "/var/db",         S_IFDIR, 0755, "root", "root", 0 },
+       { "/var/empty",      S_IFDIR, 0755, "root", "root", 0 },
+       { "/var/lib",        S_IFDIR, 0755, "root", "root", 0 },
+       { "/var/log",        S_IFDIR, 0755, "root", "root", 0 },
+       { "/var/mail",       S_IFDIR, 0755, "root", "root", 0 },
+       { "/var/opt",        S_IFDIR, 0755, "root", "root", 0 },
+       { "/var/run",        S_IFLNK, 0755, "root", "root", 0 },
+       { "/var/spool",      S_IFDIR, 0755, "root", "root", 0 },
+       { "/var/tmp",        S_IFDIR, 0755, "root", "root", 0 },
 
        // Do not allow any subdirectories in /var
-       { "/var/*",       0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
-       { "/var/empty/**",0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
-       { "/var/tmp/**",  0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
+       { "/var/*",                0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
+       { "/var/empty/**",         0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
+       { "/var/tmp/**",           0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
 
        // /boot
-       { "/boot",        S_IFDIR, 0, 0755, "root", "root" },
-       { "/boot/efi",    S_IFDIR, 0, 0755, "root", "root" },
+       { "/boot",           S_IFDIR, 0755, "root", "root", 0 },
+       { "/boot/efi",       S_IFDIR, 0755, "root", "root", 0 },
 
        // /dev (nothing may exist in it)
-       { "/dev",         S_IFDIR, 0, 0755, "root", "root" },
-       { "/dev/**",      0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
+       { "/dev",            S_IFDIR, 0755, "root", "root", 0 },
+       { "/dev/**",               0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
 
        // /etc
-       { "/etc",         S_IFDIR, 0, 0755, "root", "root" },
+       { "/etc",            S_IFDIR, 0755, "root", "root", 0 },
 
        // /home
-       { "/home",        S_IFDIR, 0, 0755, "root", "root" },
-       { "/home/**",     0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
+       { "/home",           S_IFDIR, 0755, "root", "root", 0 },
+       { "/home/**",              0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
 
        // /opt
-       { "/opt",         S_IFDIR, 0, 0755, "root", "root" },
+       { "/opt",            S_IFDIR, 0755, "root", "root", 0 },
        // These directories belong to the "local administrator"
        // https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s13.html
-       { "/opt/bin",     0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
-       { "/opt/doc",     0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
-       { "/opt/include", 0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
-       { "/opt/info",    0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
-       { "/opt/lib",     0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
-       { "/opt/man",     0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
+       { "/opt/bin",              0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
+       { "/opt/doc",              0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
+       { "/opt/include",          0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
+       { "/opt/info",             0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
+       { "/opt/lib",              0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
+       { "/opt/man",              0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
 
        // /proc
-       { "/proc",        S_IFDIR, 0, 0755, "root", "root" },
-       { "/proc/**",     0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
+       { "/proc",           S_IFDIR, 0755, "root", "root", 0 },
+       { "/proc/**",              0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
 
        // /run
-       { "/run",         S_IFDIR, 0, 0755, "root", "root" },
-       { "/run/**",      0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
+       { "/run",            S_IFDIR, 0755, "root", "root", 0 },
+       { "/run/**",               0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
 
        // /sys
-       { "/sys",         S_IFDIR, 0, 0755, "root", "root" },
-       { "/sys/**",      0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
+       { "/sys",            S_IFDIR, 0755, "root", "root", 0 },
+       { "/sys/**",               0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
 
        // /tmp
-       { "/tmp",         S_IFDIR, 0, 1755, "root", "root" },
-       { "/tmp/**",      0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
+       { "/tmp",            S_IFDIR, 1755, "root", "root", 0 },
+       { "/tmp/**",               0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
 
        // FHS Directories
-       { "/media",       S_IFDIR, 0, 0755, "root", "root" },
-       { "/mnt",         S_IFDIR, 0, 0755, "root", "root" },
-       { "/srv",         S_IFDIR, 0, 0755, "root", "root" },
+       { "/media",          S_IFDIR, 0755, "root", "root", 0 },
+       { "/mnt",            S_IFDIR, 0755, "root", "root", 0 },
+       { "/srv",            S_IFDIR, 0755, "root", "root", 0 },
 
        // /bin, /sbin, /lib, and /lib64 have to be symlinks
-       { "/bin",         S_IFLNK, 0, 0777, NULL, NULL },
-       { "/lib",         S_IFLNK, 0, 0777, NULL, NULL },
-       { "/lib64",       S_IFLNK, 0, 0777, NULL, NULL },
-       { "/sbin",        S_IFLNK, 0, 0777, NULL, NULL },
+       { "/bin",            S_IFLNK, 0777,   NULL,   NULL, 0 },
+       { "/lib",            S_IFLNK, 0777,   NULL,   NULL, 0 },
+       { "/lib64",          S_IFLNK, 0777,   NULL,   NULL, 0 },
+       { "/sbin",           S_IFLNK, 0777,   NULL,   NULL, 0 },
 
        // There cannot be anything else in /
-       { "/*",           0, PAKFIRE_FHS_MUSTNOTEXIST, 0, NULL, NULL },
+       { "/*",                    0,    0,   NULL,   NULL, PAKFIRE_FHS_MUSTNOTEXIST },
 
        // Catch all so that we won't throw an error
-       { "/**",          0, 0, 0, NULL, NULL },
+       { "/**",                   0,    0,   NULL,   NULL, 0 },
 
        // Sentinel
        { NULL },