- add libbb function str_tolower to convert a string to lowercase.

[oweals/busybox.git] / miscutils / makedevs.c

diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index 66b4ce00d44e5d09ebfdeb392d2dac47957ca393..aa000a7ab8692163fbb8049a02a2bb5121908e88 100644 (file)
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -10,6 +10,7 @@
 #include "busybox.h"
 
 #ifdef CONFIG_FEATURE_MAKEDEVS_LEAF
+int makedevs_main(int argc, char **argv);
 int makedevs_main(int argc, char **argv)
 {
        mode_t mode;
@@ -21,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;
@@ -53,7 +54,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;
@@ -68,6 +69,7 @@ int makedevs_main(int argc, char **argv)
 
 /* Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */
 
+int makedevs_main(int argc, char **argv);
 int makedevs_main(int argc, char **argv)
 {
        FILE *table = stdin;
@@ -76,7 +78,7 @@ int makedevs_main(int argc, char **argv)
        int linenum = 0;
        int ret = EXIT_SUCCESS;
 
-       bb_getopt_ulflags(argc, argv, "d:", &line);
+       getopt32(argc, argv, "d:", &line);
        if (line)
                table = xfopen(line, "r");
 
@@ -95,7 +97,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;
@@ -127,8 +129,8 @@ int makedevs_main(int argc, char **argv)
                        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, xgroup2gid) : getgid();
+               uid = (*user) ? get_ug_id(user, xuname2uid) : getuid();
                full_name = concat_path_file(rootdir, name);
 
                if (type == 'd') {
@@ -185,9 +187,9 @@ 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: 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) {
@@ -201,9 +203,9 @@ int makedevs_main(int argc, char **argv)
                                }
                                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: 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) {