Review fixes

Author: wismill

src/compose/table.c

@@ -176,35 +176,27 @@ xkb_compose_table_new_from_locale(struct xkb_context *ctx,
         return NULL;
 
     path = get_xcomposefile_path(ctx);
-    if (path && is_regular_file(path)) {
-        file = fopen(path, "rb");
-        if (file)
-            goto found_path;
-    }
+    file = open_regular_file(path);
+    if (file)
+        goto found_path;
     free(path);
 
     path = get_xdg_xcompose_file_path(ctx);
-    if (path && is_regular_file(path)) {
-        file = fopen(path, "rb");
-        if (file)
-            goto found_path;
-    }
+    file = open_regular_file(path);
+    if (file)
+        goto found_path;
     free(path);
 
     path = get_home_xcompose_file_path(ctx);
-    if (path && is_regular_file(path)) {
-        file = fopen(path, "rb");
-        if (file)
-            goto found_path;
-    }
+    file = open_regular_file(path);
+    if (file)
+        goto found_path;
     free(path);
 
     path = get_locale_compose_file_path(ctx, table->locale);
-    if (path && is_regular_file(path)) {
-        file = fopen(path, "rb");
-        if (file)
-            goto found_path;
-    }
+    file = open_regular_file(path);
+    if (file)
+        goto found_path;
     free(path);
 
     log_err(ctx, XKB_LOG_MESSAGE_NO_ID,

src/utils.c

@@ -24,11 +24,11 @@
 #include "config.h"
 
 #include <sys/stat.h>
+#include <fcntl.h>
 #include "utils.h"
 
 #ifdef HAVE_MMAP
 
-#include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
 #include <sys/types.h>
@@ -111,14 +111,21 @@ unmap_file(char *str, size_t size)
 
 #endif
 
-bool
-is_regular_file(const char *path)
+FILE*
+open_regular_file(const char *path)
 {
+    if (!path) return NULL;
+
+    int fd = open(path, O_RDONLY);
     struct stat stat_buf;
-    int err = stat(path, &stat_buf);
-    if (err != 0) return false;
+    int err = fstat(fd, &stat_buf);
+
+    if (err != 0 || !S_ISREG(stat_buf.st_mode)) {
+        close(fd);
+        return NULL;
+    }
 
-    return S_ISREG(stat_buf.st_mode);
+    return fdopen(fd, "rb");
 }
 
 // ASCII lower-case map.

src/utils.h

@@ -266,8 +266,8 @@ check_eaccess(const char *path, int mode)
     return true;
 }
 
-bool
-is_regular_file(const char *path);
+FILE*
+open_regular_file(const char *path);
 
 #if defined(HAVE_SECURE_GETENV)
 # define secure_getenv secure_getenv