Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/util-linux/umount.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/util-linux/umount.c (modified) (7 diffs)

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

@@ -6 +6 @@
  * Copyright (C) 2005 by Rob Landley <rob@landley.net>
  *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 #include <mntent.h>
-#include <getopt.h>
+#include <sys/mount.h>
 #include "libbb.h"
 
-#define OPTION_STRING       "flDnravdt:"
-#define OPT_FORCE           1
-#define OPT_LAZY            2
-#define OPT_DONTFREELOOP    4
-#define OPT_NO_MTAB         8
-#define OPT_REMOUNT         16
-#define OPT_ALL             (ENABLE_FEATURE_UMOUNT_ALL ? 32 : 0)
+#if defined(__dietlibc__)
+// TODO: This does not belong here.
+/* 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
+ * dietlibc-0.30 does not have implementation of getmntent_r() */
+static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
+        char* buffer UNUSED_PARAM, int bufsize UNUSED_PARAM)
+{
+    struct mntent* ment = getmntent(stream);
+    return memcpy(result, ment, sizeof(*ment));
+}
+#endif
 
-int umount_main(int argc, char **argv);
-int umount_main(int argc, char **argv)
+/* ignored: -v -d -t -i */
+#define OPTION_STRING           "fldnra" "vdt:i"
+#define OPT_FORCE               (1 << 0) // Same as MNT_FORCE
+#define OPT_LAZY                (1 << 1) // Same as MNT_DETACH
+#define OPT_FREELOOP            (1 << 2)
+#define OPT_NO_MTAB             (1 << 3)
+#define OPT_REMOUNT             (1 << 4)
+#define OPT_ALL                 (ENABLE_FEATURE_UMOUNT_ALL ? (1 << 5) : 0)
+
+int umount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int umount_main(int argc UNUSED_PARAM, char **argv)
 {
     int doForce;
-    char path[2*PATH_MAX];
     struct mntent me;
     FILE *fp;
-    char *fstype = 0;
+    char *fstype = NULL;
     int status = EXIT_SUCCESS;
     unsigned opt;
@@ -37 +48 @@
     } *mtl, *m;
 
-    /* Parse any options */
-
     opt = getopt32(argv, OPTION_STRING, &fstype);
-
-    argc -= optind;
+    //argc -= optind;
     argv += optind;
 
+    // MNT_FORCE and MNT_DETACH (from linux/fs.h) must match
+    // OPT_FORCE and OPT_LAZY, otherwise this trick won't work:
     doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY));
 
@@ -51 +61 @@
      * entry.  Notice that this also naturally reverses the list so that -a
      * umounts the most recent entries first. */
+    m = mtl = NULL;
 
-    m = mtl = 0;
-
-    /* If we're umounting all, then m points to the start of the list and
-     * the argument list should be empty (which will match all). */
-
+    // If we're umounting all, then m points to the start of the list and
+    // the argument list should be empty (which will match all).
     fp = setmntent(bb_path_mtab_file, "r");
     if (!fp) {
         if (opt & OPT_ALL)
-            bb_error_msg_and_die("cannot open %s", bb_path_mtab_file);
+            bb_error_msg_and_die("can't open '%s'", bb_path_mtab_file);
     } else {
-        while (getmntent_r(fp, &me, path, sizeof(path))) {
+        while (getmntent_r(fp, &me, bb_common_bufsiz1, sizeof(bb_common_bufsiz1))) {
             /* Match fstype if passed */
-            if (fstype && match_fstype(&me, fstype))
+            if (!match_fstype(&me, fstype))
                 continue;
-            m = xmalloc(sizeof(struct mtab_list));
+            m = xzalloc(sizeof(*m));
             m->next = mtl;
             m->device = xstrdup(me.mnt_fsname);
@@ -75 +83 @@
     }
 
-    /* If we're not umounting all, we need at least one argument. */
+    // If we're not umounting all, we need at least one argument.
     if (!(opt & OPT_ALL) && !fstype) {
-        m = 0;
-        if (!argc) bb_show_usage();
+        if (!argv[0])
+            bb_show_usage();
+        m = NULL;
     }
 
@@ -85 +94 @@
         int curstat;
         char *zapit = *argv;
+        char *path;
 
         // Do we already know what to umount this time through the loop?
-        if (m) safe_strncpy(path, m->dir, PATH_MAX);
+        if (m)
+            path = xstrdup(m->dir);
         // For umount -a, end of mtab means time to exit.
-        else if (opt & OPT_ALL) break;
-        // Get next command line argument (and look it up in mtab list)
-        else if (!argc--) break;
+        else if (opt & OPT_ALL)
+            break;
+        // Use command line argument (and look it up in mtab list)
         else {
+            if (!zapit)
+                break;
             argv++;
-            realpath(zapit, path);
-            for (m = mtl; m; m = m->next)
-                if (!strcmp(path, m->dir) || !strcmp(path, m->device))
-                    break;
+            path = xmalloc_realpath(zapit);
+            if (path) {
+                for (m = mtl; m; m = m->next)
+                    if (strcmp(path, m->dir) == 0 || strcmp(path, m->device) == 0)
+                        break;
+            }
         }
         // If we couldn't find this sucker in /etc/mtab, punt by passing our
@@ -108 +123 @@
 
         // Force the unmount, if necessary.
-        if (curstat && doForce) {
+        if (curstat && doForce)
             curstat = umount2(zapit, doForce);
-            if (curstat)
-                bb_error_msg("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, zapit, NULL, MS_REMOUNT|MS_RDONLY, NULL);
-            bb_error_msg(curstat ? "cannot remount %s read-only" :
-                         "%s busy - remounted read-only", m->device);
-        }
-
         if (curstat) {
-            status = EXIT_FAILURE;
-            bb_perror_msg("cannot umount %s", zapit);
+            if ((opt & OPT_REMOUNT) && errno == EBUSY && m) {
+                // Note! Even if we succeed here, later we should not
+                // free loop device or erase mtab entry!
+                const char *msg = "%s busy - remounted read-only";
+                curstat = mount(m->device, zapit, NULL, MS_REMOUNT|MS_RDONLY, NULL);
+                if (curstat) {
+                    msg = "can't remount %s read-only";
+                    status = EXIT_FAILURE;
+                }
+                bb_error_msg(msg, m->device);
+            } else {
+                status = EXIT_FAILURE;
+                bb_perror_msg("can't %sumount %s", (doForce ? "forcibly " : ""), 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)
+            // De-allocate the loop device.  This ioctl should be ignored on
+            // any non-loop block devices.
+            if (ENABLE_FEATURE_MOUNT_LOOP && (opt & OPT_FREELOOP) && m)
                 del_loop(m->device);
             if (ENABLE_FEATURE_MTAB_SUPPORT && !(opt & OPT_NO_MTAB) && m)
@@ -136 +154 @@
         // 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))
-                break;
+        if (m) {
+            while ((m = m->next) != NULL)
+                // NB: if m is non-NULL, path is non-NULL as well
+                if ((opt & OPT_ALL) || strcmp(path, m->device) == 0)
+                    break;
+        }
+        free(path);
     }
 
     // Free mtab list if necessary
-
     if (ENABLE_FEATURE_CLEAN_UP) {
         while (mtl) {