Forgot some debugging noise.

[oweals/busybox.git] / umount.c

diff --git a/umount.c b/umount.c
index a83a508f7c6d00965a1485dd32953c136b3cb356..68b27e385d62fb1eb86435a7aa93b204ed142a8e 100644 (file)
--- a/umount.c
+++ b/umount.c
@@ -1,7 +1,9 @@
 /*
  * Mini umount implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * Copyright (C) 1999 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
  * it under the terms of the GNU General Public License as published by
@@ -26,35 +28,93 @@
 #include <fstab.h>
 #include <errno.h>
 
-const char umount_usage[] = 
-"Usage: umount filesystem\n"
-"   or: umount directory\n"
-"   or: umount -a"
-"to unmount all mounted file systems.\n";
+static const char umount_usage[] = 
+"umount [flags] filesystem|directory\n\n"
+"Flags:\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
+;
+
+
+static int useMtab = TRUE;
+static int umountAll = FALSE;
+extern const char mtab_file[]; /* Defined in utility.c */
+
+#define MIN(x,y) (x > y ? x : y)
+
+static int 
+do_umount(const char* name, int useMtab)
+{
+    int status;
+    struct mntent *m;
+    FILE *mountTable;
+    const char *blockDevice = NULL;
+
+    if ((mountTable = setmntent (mtab_file, "r"))) {
+       while ((m = getmntent (mountTable)) != 0) {
+           if (strncmp(m->mnt_dir, name,
+                       MIN(strlen(m->mnt_dir),strlen(name))) == 0)
+               blockDevice = m->mnt_fsname;
+           else if (strcmp(m->mnt_fsname, name) == 0) {
+               blockDevice = name;
+               name = m->mnt_dir;
+           }
+       }
+    }
+
+    status = umount(name);
+
+#if defined BB_FEATURE_MOUNT_LOOP
+    if (blockDevice != NULL && !strncmp("/dev/loop", blockDevice, 9))
+       /* this was a loop device, delete it */
+       del_loop(blockDevice);
+#endif
+#if defined BB_MTAB
+    if ( status == 0 ) {
+       if ( useMtab==TRUE )
+           erase_mtab(name);
+       return 0;
+    }
+    else
+#endif
+       return(status);
+}
 
 static int
-umount_all()
+umount_all(int useMtab)
 {
        int status;
        struct mntent *m;
         FILE *mountTable;
 
-        if ((mountTable = setmntent ("/proc/mounts", "r"))) {
+        if ((mountTable = setmntent (mtab_file, "r"))) {
             while ((m = getmntent (mountTable)) != 0) {
                 char *blockDevice = m->mnt_fsname;
-                if (strcmp (blockDevice, "/dev/root") == 0)
-                    blockDevice = (getfsfile ("/"))->fs_spec;
-               status=umount (m->mnt_dir);
+#if ! defined BB_MTAB
+               if (strcmp (blockDevice, "/dev/root") == 0) {
+                   struct fstab* fstabItem;
+                   fstabItem = getfsfile ("/");
+                   if (fstabItem != NULL) {
+                       blockDevice = fstabItem->fs_spec;
+                   }
+               }
+#endif
+               /* Don't umount /proc when doing umount -a */
+                if (strcmp (blockDevice, "proc") == 0)
+                   continue;
+
+               status=do_umount (m->mnt_dir, useMtab);
                if (status!=0) {
                    /* Don't bother retrying the umount on busy devices */
                    if (errno==EBUSY) {
                        perror(m->mnt_dir); 
                        continue;
                    }
-                   printf ("Trying to umount %s failed: %s\n", 
-                           m->mnt_dir, strerror(errno)); 
-                   printf ("Instead trying to umount %s\n", blockDevice); 
-                   status=umount (blockDevice);
+                   status=do_umount (blockDevice, useMtab);
                    if (status!=0) {
                        printf ("Couldn't umount %s on %s (type %s): %s\n", 
                                blockDevice, m->mnt_dir, m->mnt_type, strerror(errno));
@@ -67,32 +127,37 @@ umount_all()
 }
 
 extern int
-umount_main(int argc, char * * argv)
+umount_main(int argc, char** argv)
 {
-
     if (argc < 2) {
-       fprintf(stderr, "Usage: %s", umount_usage);
-       exit(FALSE);
+       usage( umount_usage); 
     }
-    argc--;
-    argv++;
 
     /* Parse any options */
-    while (**argv == '-') {
+    while (--argc > 0 && **(++argv) == '-') {
        while (*++(*argv)) switch (**argv) {
            case 'a':
-               exit ( umount_all() );
+               umountAll = TRUE;
                break;
+#ifdef BB_MTAB
+           case 'n':
+               useMtab = FALSE;
+               break;
+#endif
            default:
-               fprintf(stderr, "Usage: %s\n", umount_usage);
-               exit( FALSE);
+               usage( umount_usage);
        }
     }
-    if ( umount(*argv) == 0 )
-            exit (TRUE);
+
+
+    if(umountAll==TRUE) {
+       exit(umount_all(useMtab));
+    }
+    if ( do_umount(*argv,useMtab) == 0 )
+       exit (TRUE);
     else {
        perror("umount");
-       exit( FALSE);
+       exit(FALSE);
     }
 }