summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorEric Andersen2000-06-19 18:38:51 +0000
committerEric Andersen2000-06-19 18:38:51 +0000
commite1e23eecab5bab12fbe025eea01e730a1e3e1f3f (patch)
tree319366ea13e032a03366e187da77e9c0e0d9d023 /util-linux
parent5e29c6ffce509bc492a2acc4dd4102ac96d0f515 (diff)
downloadbusybox-e1e23eecab5bab12fbe025eea01e730a1e3e1f3f.zip
busybox-e1e23eecab5bab12fbe025eea01e730a1e3e1f3f.tar.gz
Make umount work and compile cleanly under libc5 and libc6.
-Erik
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/umount.c21
1 files changed, 16 insertions, 5 deletions
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 86833b7..4aed989 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -24,9 +24,22 @@
#include "internal.h"
#include <stdio.h>
-#include <sys/mount.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. */
static const char umount_usage[] =
@@ -286,9 +299,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);
}