From: Angelo Compagnucci Date: Sat, 11 Apr 2015 13:40:31 +0000 (+0200) Subject: package/makedevs: add recursive option X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=410f9b60137820143caf51a2a37da6f8fa16679f;p=buildroot.git package/makedevs: add recursive option This patch adds the option to change owner/permission of a directory recursively. [Thomas: s/folder/directory/, as suggested by Yann.] Signed-off-by: Angelo Compagnucci Tested-by: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c index ab90b93b19..ee0f9fb0bf 100644 --- a/package/makedevs/makedevs.c +++ b/package/makedevs/makedevs.c @@ -34,8 +34,12 @@ #ifndef __APPLE__ #include /* major() and minor() */ #endif +#include const char *bb_applet_name; +uid_t recursive_uid; +gid_t recursive_gid; +unsigned int recursive_mode; void bb_verror_msg(const char *s, va_list p) { @@ -332,6 +336,7 @@ void bb_show_usage(void) fprintf(stderr, "Where name is the file name, type can be one of:\n"); fprintf(stderr, " f A regular file\n"); fprintf(stderr, " d Directory\n"); + fprintf(stderr, " r Directory recursively\n"); fprintf(stderr, " c Character special device file\n"); fprintf(stderr, " b Block special device file\n"); fprintf(stderr, " p Fifo (named pipe)\n"); @@ -364,6 +369,23 @@ void bb_show_usage(void) exit(1); } +bb_recursive(const char *fpath, const struct stat *sb, + int tflag, struct FTW *ftwbuf){ + + if (chown(fpath, recursive_uid, recursive_gid) == -1) { + bb_perror_msg("chown failed for %s", fpath); + return -1; + } + if (recursive_mode != -1) { + if (chmod(fpath, recursive_mode) < 0) { + bb_perror_msg("chmod failed for %s", fpath); + return -1; + } + } + + return 0; +} + int main(int argc, char **argv) { int opt; @@ -474,6 +496,15 @@ int main(int argc, char **argv) ret = EXIT_FAILURE; goto loop; } + } else if (type == 'r') { + recursive_uid = uid; + recursive_gid = gid; + recursive_mode = mode; + if (nftw(full_name, bb_recursive, 20, FTW_MOUNT | FTW_PHYS) < 0) { + bb_perror_msg("line %d: recursive failed for %s", linenum, full_name); + ret = EXIT_FAILURE; + goto loop; + } } else { dev_t rdev;