X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-rules.c;h=9864016d1447c1ab041ead6ed0d515d22f73d5a8;hb=f12ea7dad09366b2d6cc0c28609a72094a4c9353;hp=85f78bcdefcd19bf9effbdf2eb28926a766d6470;hpb=209b031e4fb7b50fc1812fc7c6ea59ca2f5d0c78;p=elogind.git

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 85f78bcde..9864016d1 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1533,15 +1533,19 @@ static int parse_file(struct udev_rules *rules, const char *filename)
         int line_nr = 0;
         unsigned int i;
 
-        if (null_or_empty_path(filename)) {
-                log_debug("skip empty file: %s", filename);
-                return 0;
+        f = fopen(filename, "re");
+        if (!f) {
+                if (errno == ENOENT)
+                        return 0;
+                else
+                        return -errno;
         }
-        log_debug("read rules file: %s", filename);
 
-        f = fopen(filename, "re");
-        if (f == NULL)
-                return -1;
+        if (null_or_empty_fd(fileno(f))) {
+                log_debug("Skipping empty file: %s", filename);
+                return 0;
+        } else
+                log_debug("Reading rules file: %s", filename);
 
         first_token = rules->token_cur;
         filename_off = rules_add_string(rules, filename);