X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fmakedevs.c;h=24d07ebe0f3f253fd8b35395aee346bf306dda9e;hb=3a2b103eea9f87fa476b1f8c4ed4a11b7422eab8;hp=eb3e3680d7fa6d81fb151f082e69d2731c7ac1c9;hpb=e8614dbcd75915e6bf5badb8669efc04e62453f8;p=oweals%2Fbusybox.git diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index eb3e3680d..24d07ebe0 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c @@ -1,24 +1,24 @@ /* vi: set sw=4 ts=4: */ +/* + * public domain -- Dave 'Kill a Cop' Cinege + * + * makedevs + * Make ranges of device files quickly. + * known bugs: can't deal with alpha ranges + */ #include #include #include #include -#include #include +#include #include #include #include /* major() and minor() */ #include "busybox.h" #ifdef CONFIG_FEATURE_MAKEDEVS_LEAF -/* - * public domain -- Dave 'Kill a Cop' Cinege - * - * makedevs - * Make ranges of device files quickly. - * known bugs: can't deal with alpha ranges - */ int makedevs_main(int argc, char **argv) { mode_t mode; @@ -75,48 +75,26 @@ int makedevs_main(int argc, char **argv) #elif defined CONFIG_FEATURE_MAKEDEVS_TABLE -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ +/* Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ -extern int makedevs_main(int argc, char **argv) +int makedevs_main(int argc, char **argv) { - int opt; FILE *table = stdin; char *rootdir = NULL; char *line = NULL; int linenum = 0; int ret = EXIT_SUCCESS; - while ((opt = getopt(argc, argv, "d:")) != -1) { - switch(opt) { - case 'd': - table = bb_xfopen((line=optarg), "r"); - break; - default: - bb_show_usage(); - } - } + unsigned long flags; + flags = bb_getopt_ulflags(argc, argv, "d:", &line); + if (line) + table = bb_xfopen(line, "r"); if (optind >= argc || (rootdir=argv[optind])==NULL) { - bb_error_msg_and_die("root directory not speficied"); + bb_error_msg_and_die("root directory not specified"); } - if (chdir(rootdir) != 0) { - bb_perror_msg_and_die("Couldnt chdir to %s", rootdir); - } + bb_xchdir(rootdir); umask(0); @@ -158,16 +136,9 @@ extern int makedevs_main(int argc, char **argv) if (name[0] == '#') { continue; } - if (group) { - gid = get_ug_id(group, my_getgrnam); - } else { - gid = getgid(); - } - if (user) { - uid = get_ug_id(user, my_getpwnam); - } else { - uid = getuid(); - } + + gid = (*group) ? get_ug_id(group, bb_xgetgrnam) : getgid(); + uid = (*user) ? get_ug_id(user, bb_xgetpwnam) : getuid(); full_name = concat_path_file(rootdir, name); if (type == 'd') { @@ -177,7 +148,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') { @@ -189,7 +183,7 @@ extern int makedevs_main(int argc, char **argv) else if (type == 'b') { mode |= S_IFBLK; } else { - bb_error_msg("line %d: Unsupported file type %c", linenum, type); + bb_error_msg("line %d: unsupported file type %c", linenum, type); ret = EXIT_FAILURE; goto loop; } @@ -203,25 +197,33 @@ extern int makedevs_main(int argc, char **argv) sprintf(full_name_inc, "%s%d", full_name, i); rdev = (major << 8) + minor + (i * increment - start); if (mknod(full_name_inc, mode, rdev) == -1) { - bb_perror_msg("line %d: Couldnt create node %s", linenum, full_name_inc); + bb_perror_msg("line %d: could not create node %s", linenum, full_name_inc); ret = EXIT_FAILURE; } else if (chown(full_name_inc, uid, gid) == -1) { 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 { rdev = (major << 8) + minor; if (mknod(full_name, mode, rdev) == -1) { - bb_perror_msg("line %d: Couldnt create node %s", linenum, full_name); + bb_perror_msg("line %d: could not create node %s", linenum, full_name); ret = EXIT_FAILURE; } else if (chown(full_name, uid, gid) == -1) { 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: @@ -234,5 +236,5 @@ loop: } #else -# error makdedevs configuration error, either leaf or table must be selected +# error makedevs configuration error, either leaf or table must be selected #endif