mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

Add an additional stat() check if a d_type check fails for kbfunc_exec lookups

Browse Source 
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.
This commit is contained in:
James McDonald 2015-04-12 10:32:24 +02:00 committed by Christian Neukirchen
parent da1021c60c
commit 4cb6e0b17b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kbfunc.c
View File

@ -246,6 +246,7 @@ kbfunc_exec(struct client_ctx *cc, union arg *arg)
struct menu *mi; struct menu *mi;
struct menu_q menuq; struct menu_q menuq;
int l, i, cmd = arg->i; int l, i, cmd = arg->i;
struct stat sb;
switch (cmd) { switch (cmd) {
case CWM_EXEC_PROGRAM: case CWM_EXEC_PROGRAM:
@ -276,12 +277,16 @@ kbfunc_exec(struct client_ctx *cc, union arg *arg)
continue; continue;
while ((dp = readdir(dirp)) != NULL) { 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)); (void)memset(tpath, '\0', sizeof(tpath));
l = snprintf(tpath, sizeof(tpath), "%s/%s", paths[i], l = snprintf(tpath, sizeof(tpath), "%s/%s", paths[i],
dp->d_name); 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)) if (l == -1 || l >= sizeof(tpath))
continue; continue;
if (access(tpath, X_OK) == 0) if (access(tpath, X_OK) == 0)