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

diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index 4619e4dd5..3bc1559c7 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -21,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;
@@ -53,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;
@@ -95,7 +95,7 @@ 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;
@@ -187,7 +187,7 @@ 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) {
@@ -203,7 +203,7 @@ 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) {