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 4aed989fb730495492c0d44dc01976c15eff479e..59dcb6651b9589e929dd9336934a601d7dc6b068 100644 (file)
--- a/umount.c
+++ b/umount.c
@@ -24,22 +24,21 @@
 
 #include "internal.h"
 #include <stdio.h>
-//#include <sys/mount.h>
 #include <mntent.h>
 #include <errno.h>
-#include <linux/unistd.h>
 
 
-/* Include our own version of sys/mount.h, since libc5 doesn't
- * know about umount2 */
-static _syscall1(int, umount, const char *, special_file);
-static _syscall2(int, umount2, const char *, special_file, int, flags);
-static _syscall5(int, mount, const char *, special_file, const char *, dir,
-               const char *, fstype, unsigned long int, rwflag, const void *, data);
 #define MNT_FORCE              1
-#define MS_MGC_VAL             0xc0ed0000              /* Magic flag number to indicate "new" flags */
-#define MS_REMOUNT             32                              /* Alter flags of a mounted FS.  */
-#define MS_RDONLY              1                               /* Mount read-only.  */
+#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[] =
@@ -202,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