Changed bb_regcomp to xregcomp and #if 0'ed out destroy_cmd_strs in sed.c

[oweals/busybox.git] / umount.c

diff --git a/umount.c b/umount.c
index 0f087e197e8ae0b9cf320a220f27841d07460943..59dcb6651b9589e929dd9336934a601d7dc6b068 100644 (file)
--- a/umount.c
+++ b/umount.c
@@ -3,7 +3,7 @@
  * Mini umount implementation for busybox
  *
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,22 +24,40 @@
 
 #include "internal.h"
 #include <stdio.h>
-#include <sys/mount.h>
 #include <mntent.h>
-#include <fstab.h>
 #include <errno.h>
 
 
+#define MNT_FORCE              1
+#define MS_MGC_VAL             0xc0ed0000 /* Magic number indicatng "new" flags */
+#define MS_REMOUNT             32      /* Alter flags of a mounted FS.  */
+#define MS_RDONLY              1       /* Mount read-only.  */
+
+extern int mount (__const char *__special_file, __const char *__dir,
+                       __const char *__fstype, unsigned long int __rwflag,
+                       __const void *__data);
+extern int umount (__const char *__special_file);
+extern int umount2 (__const char *__special_file, int __flags);
+
+
+
 static const char umount_usage[] =
-       "umount [flags] filesystem|directory\n\n"
-       "Flags:\n" "\t-a:\tUnmount all file systems"
+       "umount [flags] filesystem|directory\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "Unmount file systems\n"
+       "\nFlags:\n" "\t-a:\tUnmount all file systems"
 #ifdef BB_MTAB
        " in /etc/mtab\n\t-n:\tDon't erase /etc/mtab entries\n"
 #else
        "\n"
 #endif
-#ifdef BB_FEATURE_REMOUNT
        "\t-r:\tTry to remount devices as read-only if mount is busy\n"
+#if defined BB_FEATURE_MOUNT_FORCE
+       "\t-f:\tForce filesystem umount (i.e. unreachable NFS server)\n"
+#endif
+#if defined BB_FEATURE_MOUNT_LOOP
+       "\t-l:\tDo not free loop device (if a loop device has been used)\n"
+#endif
 #endif
 ;
 
@@ -53,6 +71,12 @@ static struct _mtab_entry_t *mtab_cache = NULL;
 
 
 
+#if defined BB_FEATURE_MOUNT_FORCE
+static int doForce = FALSE;
+#endif
+#if defined BB_FEATURE_MOUNT_LOOP
+static int freeLoop = TRUE;
+#endif
 static int useMtab = TRUE;
 static int umountAll = FALSE;
 static int doRemount = FALSE;
@@ -81,8 +105,7 @@ void mtab_read(void)
                return;
        }
        while ((e = getmntent(fp))) {
-               entry = malloc(sizeof(struct _mtab_entry_t));
-
+               entry = xmalloc(sizeof(struct _mtab_entry_t));
                entry->device = strdup(e->mnt_fsname);
                entry->mountpt = strdup(e->mnt_dir);
                entry->next = mtab_cache;
@@ -103,11 +126,10 @@ char *mtab_getinfo(const char *match, const char which)
                        } else {
 #if !defined BB_MTAB
                                if (strcmp(cur->device, "/dev/root") == 0) {
-                                       struct fstab *fstabItem;
-
-                                       fstabItem = getfsfile("/");
-                                       if (fstabItem != NULL)
-                                               return fstabItem->fs_spec;
+                                       /* Adjusts device to be the real root device,
+                                        * or leaves device alone if it can't find it */
+                                       find_real_root_device_name( cur->device);
+                                       return ( cur->device);
                                }
 #endif
                                return cur->device;
@@ -140,6 +162,9 @@ char *mtab_next(void **iter)
        return mp;
 }
 
+/* Don't bother to clean up, since exit() does that 
+ * automagically, so we can save a few bytes */
+#if 0
 void mtab_free(void)
 {
        struct _mtab_entry_t *this, *next;
@@ -155,6 +180,7 @@ void mtab_free(void)
                this = next;
        }
 }
+#endif
 
 static int do_umount(const char *name, int useMtab)
 {
@@ -167,24 +193,29 @@ static int do_umount(const char *name, int useMtab)
        status = umount(name);
 
 #if defined BB_FEATURE_MOUNT_LOOP
-       if (blockDevice != NULL && !strncmp("/dev/loop", blockDevice, 9))
+       if (freeLoop == TRUE && blockDevice != NULL && !strncmp("/dev/loop", blockDevice, 9))
                /* this was a loop device, delete it */
                del_loop(blockDevice);
 #endif
-#if defined BB_FEATURE_REMOUNT
+#if defined BB_FEATURE_MOUNT_FORCE
+       if (status != 0 && doForce == TRUE) {
+               status = umount2(blockDevice, MNT_FORCE);
+               if (status != 0) {
+                       fatalError("forced umount of %s failed!\n", blockDevice);
+               }
+       }
+#endif
        if (status != 0 && doRemount == TRUE && errno == EBUSY) {
                status = mount(blockDevice, name, NULL,
                                           MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL);
                if (status == 0) {
                        fprintf(stderr, "umount: %s busy - remounted read-only\n",
                                        blockDevice);
-                       /* TODO: update mtab if BB_MTAB is defined */
                } else {
                        fprintf(stderr, "umount: Cannot remount %s read-only\n",
                                        blockDevice);
                }
        }
-#endif
        if (status == 0) {
 #if defined BB_MTAB
                if (useMtab == TRUE)
@@ -236,16 +267,26 @@ extern int umount_main(int argc, char **argv)
                        case 'a':
                                umountAll = TRUE;
                                break;
+#if defined BB_FEATURE_MOUNT_LOOP
+                       case 'l':
+                               freeLoop = FALSE;
+                               break;
+#endif
 #ifdef BB_MTAB
                        case 'n':
                                useMtab = FALSE;
                                break;
 #endif
-#ifdef BB_FEATURE_REMOUNT
+#ifdef BB_FEATURE_MOUNT_FORCE
+                       case 'f':
+                               doForce = TRUE;
+                               break;
+#endif
                        case 'r':
                                doRemount = TRUE;
                                break;
-#endif
+                       case 'v':
+                               break; /* ignore -v */
                        default:
                                usage(umount_usage);
                        }
@@ -257,9 +298,7 @@ extern int umount_main(int argc, char **argv)
        }
        if (do_umount(*argv, useMtab) == 0)
                exit(TRUE);
-       else {
-               perror("umount");
-               exit(FALSE);
-       }
+       perror("umount");
+       return(FALSE);
 }