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

Fix stat patch to use lstat(2) and fix logic

Browse Source
This commit is contained in:
James McDonald 2015-04-23 21:20:16 +02:00 committed by Christian Neukirchen
parent 4cb6e0b17b
commit 7c4a8f3b51
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kbfunc.c
View File

@ -280,15 +280,16 @@ kbfunc_exec(struct client_ctx *cc, union arg *arg)
(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);
if (l == -1 || l >= sizeof(tpath))
continue;
/* skip everything but regular files and symlinks */ /* skip everything but regular files and symlinks */
if (dp->d_type != DT_REG && dp->d_type != DT_LNK) { if (dp->d_type != DT_REG && dp->d_type != DT_LNK) {
/* use an additional stat-based check in case d_type isn't supported */ /* use an additional stat-based check in case d_type isn't supported */
stat(tpath, &sb); if (lstat(tpath, &sb) < 0)
continue;
if (!S_ISREG(sb.st_mode) && !S_ISLNK(sb.st_mode)) if (!S_ISREG(sb.st_mode) && !S_ISLNK(sb.st_mode))
continue; continue;
} }
if (l == -1 || l >= sizeof(tpath))
continue;
if (access(tpath, X_OK) == 0) if (access(tpath, X_OK) == 0)
menuq_add(&menuq, NULL, "%s", dp->d_name); menuq_add(&menuq, NULL, "%s", dp->d_name);
} }