X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fmakedevs.c;h=3bc1559c78b511ff6704281a0fc4fcbbabe7cad8;hb=e5667c1cfe339b2f84abaabb90259ec29b91cf89;hp=7bfe54fc19fb8f3f66019881932f47ce746919d3;hpb=1b751c894b520846af8575d09187ce342e88778c;p=oweals%2Fbusybox.git

diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index 7bfe54fc1..3bc1559c7 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -1,17 +1,4 @@
 /* vi: set sw=4 ts=4: */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <time.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/sysmacros.h>     /* major() and minor() */
-#include "busybox.h"
-
-#ifdef CONFIG_FEATURE_MAKEDEVS_LEAF
 /*
  * public domain -- Dave 'Kill a Cop' Cinege <dcinege@psychosis.com>
  *
@@ -19,6 +6,10 @@
  * Make ranges of device files quickly.
  * known bugs: can't deal with alpha ranges
  */
+
+#include "busybox.h"
+
+#ifdef CONFIG_FEATURE_MAKEDEVS_LEAF
 int makedevs_main(int argc, char **argv)
 {
 	mode_t mode;
@@ -30,10 +21,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;
@@ -62,7 +53,7 @@ int makedevs_main(int argc, char **argv)
 	/* 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;
@@ -77,7 +68,7 @@ int makedevs_main(int argc, char **argv)
 
 /* 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)
 {
 	FILE *table = stdin;
 	char *rootdir = NULL;
@@ -85,18 +76,15 @@ extern int makedevs_main(int argc, char **argv)
 	int linenum = 0;
 	int ret = EXIT_SUCCESS;
 
-	unsigned long flags;
-   	flags = bb_getopt_ulflags(argc, argv, "d:", &line);
+	getopt32(argc, argv, "d:", &line);
 	if (line)
-		table = bb_xfopen(line, "r");
+		table = xfopen(line, "r");
 
 	if (optind >= argc || (rootdir=argv[optind])==NULL) {
 		bb_error_msg_and_die("root directory not specified");
 	}
 
-	if (chdir(rootdir) != 0) {
-		bb_perror_msg_and_die("could not chdir to %s", rootdir);
-	}
+	xchdir(rootdir);
 
 	umask(0);
 
@@ -107,7 +95,7 @@ extern int makedevs_main(int argc, char **argv)
 		printf("table=<stdin>\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;
@@ -131,16 +119,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;
 		}
-		
-		gid = group ? get_ug_id(group, bb_xgetgrnam) : getgid();
-		uid = user ? get_ug_id(user, bb_xgetpwnam) : 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') {
@@ -199,7 +187,7 @@ 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: could not 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) {
@@ -215,7 +203,7 @@ extern int makedevs_main(int argc, char **argv)
 			} else {
 				rdev = (major << 8) + minor;
 				if (mknod(full_name, mode, rdev) == -1) {
-					bb_perror_msg("line %d: could not 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) {
@@ -234,9 +222,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