X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fmakedevs.c;h=1f88f34288437c1e5daf4cba2193cf308d886776;hb=bfc3d82256c45fb1e6e04ca85fac8a65b34b72a1;hp=ffcbe7ac362dd2d7b12d460148d4b33c8316d1cd;hpb=54e57da96a073330463dde1f62fda85b7290ed4c;p=oweals%2Fbusybox.git diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index ffcbe7ac3..1f88f3428 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c @@ -1,18 +1,4 @@ /* vi: set sw=4 ts=4: */ - -#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 * @@ -20,6 +6,11 @@ * Make ranges of device files quickly. * known bugs: can't deal with alpha ranges */ + +#include "libbb.h" + +#if ENABLE_FEATURE_MAKEDEVS_LEAF +int makedevs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int makedevs_main(int argc, char **argv) { mode_t mode; @@ -31,10 +22,10 @@ int makedevs_main(int argc, char **argv) basedev = argv[1]; type = argv[2]; - Smajor = atoi(argv[3]); - Sminor = atoi(argv[4]); - S = atoi(argv[5]); - E = atoi(argv[6]); + Smajor = xatoi_u(argv[3]); + Sminor = xatoi_u(argv[4]); + S = xatoi_u(argv[5]); + E = xatoi_u(argv[6]); nodname = argc == 8 ? basedev : buf; mode = 0660; @@ -57,13 +48,13 @@ int makedevs_main(int argc, char **argv) int sz; sz = snprintf(buf, sizeof(buf), "%s%d", basedev, S); - if(sz<0 || sz>=sizeof(buf)) /* libc different */ + if (sz < 0 || sz >= sizeof(buf)) /* libc different */ bb_error_msg_and_die("%s too large", basedev); /* if mode != S_IFCHR and != S_IFBLK third param in mknod() ignored */ if (mknod(nodname, mode, makedev(Smajor, Sminor))) - bb_error_msg("Failed to create: %s", nodname); + bb_error_msg("failed to create: %s", nodname); if (nodname == basedev) /* ex. /dev/hda - to /dev/hda1 ... */ nodname = buf; @@ -74,50 +65,28 @@ int makedevs_main(int argc, char **argv) return 0; } -#elif defined CONFIG_FEATURE_MAKEDEVS_TABLE +#elif ENABLE_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) MAIN_EXTERNALLY_VISIBLE; +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(); - } - } + getopt32(argv, "d:", &line); + if (line) + table = 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); - } + xchdir(rootdir); umask(0); @@ -128,7 +97,7 @@ extern int makedevs_main(int argc, char **argv) printf("table=\n"); } - while ((line = bb_get_chomped_line_from_file(table))) { + while ((line = xmalloc_getline(table))) { char type; unsigned int mode = 0755; unsigned int major = 0; @@ -152,23 +121,16 @@ extern int makedevs_main(int argc, char **argv) { if (*line=='\0' || *line=='#' || isspace(*line)) continue; - bb_error_msg("line %d invalid: '%s'\n", linenum, line); + bb_error_msg("line %d invalid: '%s'", linenum, line); ret = EXIT_FAILURE; continue; } 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, xgroup2gid) : getgid(); + uid = (*user) ? get_ug_id(user, xuname2uid) : getuid(); full_name = concat_path_file(rootdir, name); if (type == 'd') { @@ -178,6 +140,28 @@ extern int makedevs_main(int argc, char **argv) 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 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; @@ -190,7 +174,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; } @@ -202,27 +186,35 @@ extern int makedevs_main(int argc, char **argv) full_name_inc = xmalloc(strlen(full_name) + 4); for (i = start; i < count; i++) { sprintf(full_name_inc, "%s%d", full_name, i); - rdev = (major << 8) + minor + (i * increment - start); + rdev = makedev(major, 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: cannot 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; + rdev = makedev(major, 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: cannot 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: @@ -231,9 +223,9 @@ loop: } fclose(table); - return 0; + return ret; } #else -# error makdedevs configuration error, either leaf or table must be selected +# error makedevs configuration error, either leaf or table must be selected #endif