From 4cb6e0b17bc44ed9d583ce221c7b3ffef1043cf5 Mon Sep 17 00:00:00 2001 From: James McDonald Date: Sun, 12 Apr 2015 10:32:24 +0200 Subject: [PATCH] Add an additional stat() check if a d_type check fails for kbfunc_exec lookups Some filesystems (eg XFS) don't populate the d_type field of struct dirent, used by kbfunc_exec to filter paths. This patch does an additional stat() check for any file that fails the d_type check which will work correctly on these filesystems. --- kbfunc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/kbfunc.c b/kbfunc.c index 6cf454c..fb71f2e 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -246,6 +246,7 @@ kbfunc_exec(struct client_ctx *cc, union arg *arg) struct menu *mi; struct menu_q menuq; int l, i, cmd = arg->i; + struct stat sb; switch (cmd) { case CWM_EXEC_PROGRAM: @@ -276,12 +277,16 @@ kbfunc_exec(struct client_ctx *cc, union arg *arg) continue; while ((dp = readdir(dirp)) != NULL) { - /* skip everything but regular files and symlinks */ - if (dp->d_type != DT_REG && dp->d_type != DT_LNK) - continue; (void)memset(tpath, '\0', sizeof(tpath)); l = snprintf(tpath, sizeof(tpath), "%s/%s", paths[i], dp->d_name); + /* skip everything but regular files and symlinks */ + if (dp->d_type != DT_REG && dp->d_type != DT_LNK) { + /* use an additional stat-based check in case d_type isn't supported */ + stat(tpath, &sb); + if (!S_ISREG(sb.st_mode) && !S_ISLNK(sb.st_mode)) + continue; + } if (l == -1 || l >= sizeof(tpath)) continue; if (access(tpath, X_OK) == 0)