Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/find_mount_point.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/find_mount_point.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/libbb/find_mount_point.c

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -18 +18 @@
  * filesystem.
  */
-struct mntent *find_mount_point(const char *name, const char *table)
+struct mntent* FAST_FUNC find_mount_point(const char *name, int subdir_too)
 {
     struct stat s;
-    dev_t mountDevice;
-    FILE *mountTable;
+    FILE *mtab_fp;
     struct mntent *mountEntry;
+    dev_t devno_of_name;
+    bool block_dev;
 
     if (stat(name, &s) != 0)
-        return 0;
+        return NULL;
 
-    if ((s.st_mode & S_IFMT) == S_IFBLK)
-        mountDevice = s.st_rdev;
-    else
-        mountDevice = s.st_dev;
+    devno_of_name = s.st_dev;
+    block_dev = 0;
+    if (S_ISBLK(s.st_mode)) {
+        devno_of_name = s.st_rdev;
+        block_dev = 1;
+    }
 
+    mtab_fp = setmntent(bb_path_mtab_file, "r");
+    if (!mtab_fp)
+        return NULL;
 
-    mountTable = setmntent(table ? table : bb_path_mtab_file, "r");
-    if (!mountTable)
-        return 0;
+    while ((mountEntry = getmntent(mtab_fp)) != NULL) {
+        /* rootfs mount in Linux 2.6 exists always,
+         * and it makes sense to always ignore it.
+         * Otherwise people can't reference their "real" root! */
+        if (strcmp(mountEntry->mnt_fsname, "rootfs") == 0)
+            continue;
 
-    while ((mountEntry = getmntent(mountTable)) != 0) {
         if (strcmp(name, mountEntry->mnt_dir) == 0
          || strcmp(name, mountEntry->mnt_fsname) == 0
@@ -44 +52 @@
             break;
         }
-        if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice)  /* Match the device. */
+
+        if (!(subdir_too || block_dev))
+            continue;
+
+        /* Is device's dev_t == name's dev_t? */
+        if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == devno_of_name)
             break;
-        if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice)  /* Match the directory's mount point. */
+        /* Match the directory's mount point. */
+        if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == devno_of_name)
             break;
     }
-    endmntent(mountTable);
+    endmntent(mtab_fp);
+
     return mountEntry;
 }