Changeset 904 in MondoRescue for trunk/mindi-busybox/util-linux/mdev.c

Timestamp:

Oct 25, 2006, 1:51:57 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r890:902 $SVN_M/branches/stable

File:

• trunk/mindi-busybox/util-linux/mdev.c (modified) (3 diffs)

trunk/mindi-busybox/util-linux/mdev.c

@@ -41 +41 @@
      * also depend on path having writeable space after it. */
 
-    strcat(path, "/dev");
-    fd = open(path, O_RDONLY);
-    len = read(fd, temp + 1, 64);
-    *temp++ = 0;
-    close(fd);
-    if (len < 1) return;
+    if (!delete) {
+        strcat(path, "/dev");
+        fd = open(path, O_RDONLY);
+        len = read(fd, temp + 1, 64);
+        *temp++ = 0;
+        close(fd);
+        if (len < 1) return;
+    }
 
     /* Determine device name, type, major and minor */
@@ -52 +54 @@
     device_name = strrchr(path, '/') + 1;
     type = path[5]=='c' ? S_IFCHR : S_IFBLK;
-    if (sscanf(temp, "%d:%d", &major, &minor) != 2) return;
 
     /* If we have a config file, look up permissions for this device */
@@ -168 +169 @@
     umask(0);
     if (!delete) {
+        if (sscanf(temp, "%d:%d", &major, &minor) != 2) return;
         if (mknod(device_name, mode | type, makedev(major, minor)) && errno != EEXIST)
             bb_perror_msg_and_die("mknod %s failed", device_name);