[PATCH wayland] Xcursor: Don't ignore unknown file types

Daniel Stone daniel at fooishbar.org
Mon Jun 18 12:01:05 PDT 2012


XFS doesn't return the file type with opendir(), and instead only
returns it when you stat() the file itself.  c66f2602 introduced a check
to ensure that only files and symlinks were loaded, while not checking
for DT_UNKNOWN.  Properly handle DT_UNKNOWN by just proceeding anyway.

Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
 cursor/xcursor.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cursor/xcursor.c b/cursor/xcursor.c
index b3fa271..360f7f3 100644
--- a/cursor/xcursor.c
+++ b/cursor/xcursor.c
@@ -873,7 +873,8 @@ load_all_cursors_from_dir(const char *path, int size,
 	ent = readdir(dir);
 	for(ent = readdir(dir); ent; ent = readdir(dir)) {
 #ifdef _DIRENT_HAVE_D_TYPE
-		if (ent->d_type != DT_REG && ent->d_type != DT_LNK)
+		if (ent->d_type != DT_UNKNOWN &&
+		    (ent->d_type != DT_REG && ent->d_type != DT_LNK))
 			continue;
 #endif
 
-- 
1.7.10



More information about the wayland-devel mailing list