emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixup makedevs to handle regular files, and also fix

Browse Source 
it to properly update file permissions as specified.
This commit is contained in:
Eric Andersen 2005-07-18 22:40:59 +00:00
parent 7b71d740b9
commit 90161c9213
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
miscutils/makedevs.c
View File

@ -178,7 +178,30 @@ extern int makedevs_main(int argc, char **argv)
ret = EXIT_FAILURE;
goto loop;
}
} else {
if ((mode != -1) && (chmod(full_name, mode) < 0)){
bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);
ret = EXIT_FAILURE;
goto loop;
}
} else if (type == 'f') {
struct stat st;
if ((stat(full_name, &st) < 0 || !S_ISREG(st.st_mode))) {
bb_perror_msg("line %d: regular file '%s' does not exist", linenum, full_name);
ret = EXIT_FAILURE;
goto loop;
}
if (chown(full_name, uid, gid) == -1) {
bb_perror_msg("line %d: chown failed for %s", linenum, full_name);
ret = EXIT_FAILURE;
goto loop;
}
if ((mode != -1) && (chmod(full_name, mode) < 0)){
bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);
ret = EXIT_FAILURE;
goto loop;
}
} else
{
dev_t rdev;
if (type == 'p') {
@ -211,6 +234,10 @@ extern int makedevs_main(int argc, char **argv)
bb_perror_msg("line %d: chown failed for %s", linenum, full_name_inc);
ret = EXIT_FAILURE;
}
if ((mode != -1) && (chmod(full_name_inc, mode) < 0)){
bb_perror_msg("line %d: chmod failed for %s", linenum, full_name_inc);
ret = EXIT_FAILURE;
}
}
free(full_name_inc);
} else {
@ -223,6 +250,10 @@ extern int makedevs_main(int argc, char **argv)
bb_perror_msg("line %d: chown failed for %s", linenum, full_name);
ret = EXIT_FAILURE;
}
if ((mode != -1) && (chmod(full_name, mode) < 0)){
bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);
ret = EXIT_FAILURE;
}
}
}
loop: