file: Mark files as executable

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

diff --git a/src/libpakfire/file.c b/src/libpakfire/file.c
index a3b1dc5b32f11f607e157de3f3aa9713092c9264..a5110880ff665e34608ffcf88a00aa24932ef77c 100644 (file)
--- a/src/libpakfire/file.c
+++ b/src/libpakfire/file.c
@@ -1121,11 +1121,15 @@ static int setup_libelf(struct pakfire* pakfire) {
 
 static int pakfire_file_classify_mode(struct pakfire_file* file) {
        // Check for regular files
-       if (S_ISREG(file->st.st_mode))
+       if (S_ISREG(file->st.st_mode)) {
                file->class |= PAKFIRE_FILE_REGULAR;
 
+               // Does the file have executable permissions?
+               if (file->st.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH))
+                       file->class |= PAKFIRE_FILE_EXECUTABLE;
+
        // Check for directories
-       else if (S_ISDIR(file->st.st_mode))
+       } else if (S_ISDIR(file->st.st_mode))
                file->class |= PAKFIRE_FILE_DIRECTORY;
 
        // Check for symlinks
@@ -1179,8 +1183,6 @@ static const struct mimetype {
        const char* mimetype;
        int class;
 } mimetypes[] = {
-       { "application/x-pie-executable", PAKFIRE_FILE_EXECUTABLE },
-       { "application/x-sharedlibary", PAKFIRE_FILE_EXECUTABLE },
        { "text/x-perl", PAKFIRE_FILE_PERL },
        { NULL, 0 },
 };

diff --git a/src/libpakfire/include/pakfire/file.h b/src/libpakfire/include/pakfire/file.h
index 4fc0b23619bb3f26aec3279a21439a824110ba0e..e2fdecff03c525558f9dc66cc070a0f26c7bef11 100644 (file)
--- a/src/libpakfire/include/pakfire/file.h
+++ b/src/libpakfire/include/pakfire/file.h
@@ -112,9 +112,11 @@ enum pakfire_file_classes {
        PAKFIRE_FILE_FIFO            = (1 << 5),
        PAKFIRE_FILE_SOCKET          = (1 << 6),
 
+       // Is the file executable?
+       PAKFIRE_FILE_EXECUTABLE      = (1 << 7),
+
        // The rest
-       PAKFIRE_FILE_ELF             = (1 << 7),
-       PAKFIRE_FILE_EXECUTABLE      = (1 << 8),
+       PAKFIRE_FILE_ELF             = (1 << 8),
        PAKFIRE_FILE_PKGCONFIG       = (1 << 9),
        PAKFIRE_FILE_PERL            = (1 << 10),
        PAKFIRE_FILE_STATIC_LIBRARY  = (1 << 11),