Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/miscutils/makedevs.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/miscutils/makedevs.c (modified) (13 diffs)

branches/2.2.5/mindi-busybox/miscutils/makedevs.c

@@ -8 +8 @@
  */
 
-#include "busybox.h"
-#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() */
-
-#ifdef CONFIG_FEATURE_MAKEDEVS_LEAF
+#include "libbb.h"
+
+#if ENABLE_FEATURE_MAKEDEVS_LEAF
+int makedevs_main(int argc, char **argv);
 int makedevs_main(int argc, char **argv)
 {
@@ -31 +23 @@
     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;
 
@@ -57 +49 @@
 
         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);
 
@@ -63 +55 @@
 
         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 ... */
@@ -74 +66 @@
 }
 
-#elif defined CONFIG_FEATURE_MAKEDEVS_TABLE
+#elif ENABLE_FEATURE_MAKEDEVS_TABLE
 
 /* 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)
 {
@@ -86 +79 @@
     int ret = EXIT_SUCCESS;
 
-    unsigned long flags;
-    flags = bb_getopt_ulflags(argc, argv, "d:", &line);
+    getopt32(argv, "d:", &line);
     if (line)
-        table = bb_xfopen(line, "r");
+        table = xfopen(line, "r");
 
     if (optind >= argc || (rootdir=argv[optind])==NULL) {
@@ -95 +87 @@
     }
 
-    bb_xchdir(rootdir);
+    xchdir(rootdir);
 
     umask(0);
@@ -106 +98 @@
     }
 
-    while ((line = bb_get_chomped_line_from_file(table))) {
+    while ((line = xmalloc_getline(table))) {
         char type;
         unsigned int mode = 0755;
@@ -130 +122 @@
             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;
@@ -138 +130 @@
         }
 
-        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);
 
@@ -171 +163 @@
                 goto loop;
             }
-        } else
-        {
+        } else {
             dev_t rdev;
 
@@ -196 +187 @@
                 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;
                     }
@@ -212 +203 @@
                 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;
                 }