Changeset 902 in MondoRescue for branches/stable/mindi-busybox/util-linux

Timestamp:

Oct 25, 2006, 12:41:23 AM (17 years ago)

Author:

Bruno Cornec

Message:

mindi-busybox now uses busybox 1.2.2 (Thanks Rob for that last update and good lucck for your future projects).

Location:

branches/stable/mindi-busybox/util-linux

Files:

• mdev.c (modified) (3 diffs)
• mount.c (modified) (1 diff)
• readprofile.c (modified) (2 diffs)
• umount.c (modified) (4 diffs)

branches/stable/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);

branches/stable/mindi-busybox/util-linux/mount.c

@@ -292 +292 @@
     // a synthetic filesystem like proc or sysfs.)
 
-    if (lstat(mp->mnt_fsname, &st));
+    if (stat(mp->mnt_fsname, &st));
     else if (!(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))) {
         // Do we need to allocate a loopback device for it?

branches/stable/mindi-busybox/util-linux/readprofile.c

@@ -68 +68 @@
     const char *mapFile, *proFile, *mult=0;
     unsigned long len=0, indx=1;
-    unsigned long long add0=0;
+    uint64_t add0=0;
     unsigned int step;
     unsigned int *buf, total, fn_len;
@@ -244 +244 @@
                     header_printed = 1;
                 }
-                printf ("\t%llx\t%u\n", (indx - 1)*step + add0, buf[indx]);
+                printf ("\t%"PRIx64"\t%u\n", (indx - 1)*step + add0, buf[indx]);
             }
             this += buf[indx++];

branches/stable/mindi-busybox/util-linux/umount.c

@@ -15 +15 @@
 #include <mntent.h>
 #include <errno.h>
-#include <string.h>
 #include <getopt.h>
 
-#define OPTION_STRING       "flDnrvad"
+#define OPTION_STRING       "flDnravd"
 #define OPT_FORCE           1
 #define OPT_LAZY            2
@@ -24 +23 @@
 #define OPT_NO_MTAB         8
 #define OPT_REMOUNT         16
-#define OPT_IGNORED         32  // -v is ignored
-#define OPT_ALL             (ENABLE_FEATURE_UMOUNT_ALL ? 64 : 0)
+#define OPT_ALL             (ENABLE_FEATURE_UMOUNT_ALL ? 32 : 0)
 
 int umount_main(int argc, char **argv)
@@ -78 +76 @@
         if (!argc) bb_show_usage();
     }
-
-
     
     // Loop through everything we're supposed to umount, and do so.
     for (;;) {
         int curstat;
+        char *zapit = *argv;
 
         // Do we already know what to umount this time through the loop?
@@ -92 +89 @@
         else if (!argc--) break;
         else {
-            realpath(*argv++, path);
+            argv++;
+            realpath(zapit, path);
             for (m = mtl; m; m = m->next)
                 if (!strcmp(path, m->dir) || !strcmp(path, m->device))
                     break;
         }
+        // If we couldn't find this sucker in /etc/mtab, punt by passing our
+        // command line argument straight to the umount syscall.  Otherwise,
+        // umount the directory even if we were given the block device.
+        if (m) zapit = m->dir;
 
         // Let's ask the thing nicely to unmount.
-        curstat = umount(path);
+        curstat = umount(zapit);
 
         // Force the unmount, if necessary.
         if (curstat && doForce) {
-            curstat = umount2(path, doForce);
+            curstat = umount2(zapit, doForce);
             if (curstat)
-                bb_error_msg_and_die("forced umount of %s failed!", path);
+                bb_error_msg_and_die("forced umount of %s failed!", zapit);
         }
 
         // If still can't umount, maybe remount read-only?
         if (curstat && (opt & OPT_REMOUNT) && errno == EBUSY && m) {
-            curstat = mount(m->device, path, NULL, MS_REMOUNT|MS_RDONLY, NULL);
+            curstat = mount(m->device, zapit, NULL, MS_REMOUNT|MS_RDONLY, NULL);
             bb_error_msg(curstat ? "Cannot remount %s read-only" :
                          "%s busy - remounted read-only", m->device);
         }
 
-        /* De-allocate the loop device.  This ioctl should be ignored on any
-         * non-loop block devices. */
-        if (ENABLE_FEATURE_MOUNT_LOOP && !(opt & OPT_DONTFREELOOP) && m)
-            del_loop(m->device);
+        if (curstat) {
+            status = EXIT_FAILURE;
+            bb_perror_msg("Couldn't umount %s", zapit);
+        } else {
+            /* De-allocate the loop device.  This ioctl should be ignored on
+             * any non-loop block devices. */
+            if (ENABLE_FEATURE_MOUNT_LOOP && !(opt & OPT_DONTFREELOOP) && m)
+                del_loop(m->device);
+            if (ENABLE_FEATURE_MTAB_SUPPORT && !(opt & OPT_NO_MTAB) && m)
+                erase_mtab(m->dir);
+        }
 
-        if (curstat) {
-            /* Yes, the ENABLE is redundant here, but the optimizer for ARM
-             * can't do simple constant propagation in local variables... */
-            if(ENABLE_FEATURE_MTAB_SUPPORT && !(opt & OPT_NO_MTAB) && m)
-                erase_mtab(m->dir);
-            status = EXIT_FAILURE;
-            bb_perror_msg("Couldn't umount %s", path);
-        }
         // Find next matching mtab entry for -a or umount /dev
+        // Note this means that "umount /dev/blah" will unmount all instances
+        // of /dev/blah, not just the most recent.
         while (m && (m = m->next))
             if ((opt & OPT_ALL) || !strcmp(path,m->device))