NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/makedevs: fix recursive chmod

Browse Source 
The logic implemented in e745c0b to stop makedevs from recursively running
chmod() on dangling symlinks excluded everything that isn't a symlink.
Other file types or directories are skipped/ignored.

Logic has been updated to exit the function if mode shouldn't be changed
or if path is a dangling symlink.

Signed-off-by: Daniel Lang <d.lang@abatec.at>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit d6d8d60ee3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Lang Daniel 2022-09-12 06:10:49 +00:00 committed by Peter Korsgaard
parent b9f874b690
commit 943a2e42c2
1 changed files with 6 additions and 5 deletions

11
package/makedevs/makedevs.c
View File

@ -446,11 +446,12 @@ int bb_recursive(const char *fpath, const struct stat *sb,
}
/* chmod() is optional, also skip if dangling symlink */
if (recursive_mode != -1 && tflag == FTW_SL && access(fpath, F_OK)) {
if (chmod(fpath, recursive_mode) < 0) {
bb_perror_msg("chmod failed for %s", fpath);
return -1;
}
if (recursive_mode == -1 || (tflag == FTW_SL && !access(fpath, F_OK)))
return 0;
if (chmod(fpath, recursive_mode) < 0) {
bb_perror_msg("chmod failed for %s", fpath);
return -1;
}
return 0;