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 18a5afe8014a9e71ffb7ec364f38de56636ab97f..59dcb6651b9589e929dd9336934a601d7dc6b068 100644 (file)
--- a/umount.c
+++ b/umount.c
@@ -24,14 +24,28 @@
 
 #include "internal.h"
 #include <stdio.h>
-#include <sys/mount.h>
 #include <mntent.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
@@ -44,6 +58,7 @@ static const char umount_usage[] =
 #if defined BB_FEATURE_MOUNT_LOOP
        "\t-l:\tDo not free loop device (if a loop device has been used)\n"
 #endif
+#endif
 ;
 
 struct _mtab_entry_t {
@@ -186,7 +201,7 @@ static int do_umount(const char *name, int useMtab)
        if (status != 0 && doForce == TRUE) {
                status = umount2(blockDevice, MNT_FORCE);
                if (status != 0) {
-                       fatalError("umount: forced umount of %s failed!\n", blockDevice);
+                       fatalError("forced umount of %s failed!\n", blockDevice);
                }
        }
 #endif
@@ -283,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);
 }