emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make umount work and compile cleanly under libc5 and libc6.

Browse Source 
-Erik
This commit is contained in:
Eric Andersen
2000-06-19 18:38:51 +00:00
parent 5e29c6ffce
commit e1e23eecab
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
umount.c
View File

@@ -24,9 +24,22 @@
#include "internal.h" #include "internal.h"
#include <stdio.h> #include <stdio.h>
#include <sys/mount.h> //#include <sys/mount.h>
#include <mntent.h> #include <mntent.h>
#include <errno.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[] = static const char umount_usage[] =
@@ -286,9 +299,7 @@ extern int umount_main(int argc, char **argv)
} }
if (do_umount(*argv, useMtab) == 0) if (do_umount(*argv, useMtab) == 0)
exit(TRUE); exit(TRUE);
else { perror("umount");
perror("umount"); return(FALSE);
exit(FALSE);
}
} }

21
util-linux/umount.c
View File

@@ -24,9 +24,22 @@
#include "internal.h" #include "internal.h"
#include <stdio.h> #include <stdio.h>
#include <sys/mount.h> //#include <sys/mount.h>
#include <mntent.h> #include <mntent.h>
#include <errno.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[] = static const char umount_usage[] =
@@ -286,9 +299,7 @@ extern int umount_main(int argc, char **argv)
} }
if (do_umount(*argv, useMtab) == 0) if (do_umount(*argv, useMtab) == 0)
exit(TRUE); exit(TRUE);
else { perror("umount");
perror("umount"); return(FALSE);
exit(FALSE);
}
} }