mirror of
https://github.com/sheumann/hush.git
synced 2024-12-23 05:29:58 +00:00
More cleanup on umount
-Erik
This commit is contained in:
parent
bd22ed8067
commit
2cd439f7f0
26
umount.c
26
umount.c
@ -26,20 +26,32 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <mntent.h>
|
#include <mntent.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <sys/mount.h>
|
|
||||||
#include <linux/unistd.h>
|
#include <linux/unistd.h>
|
||||||
|
|
||||||
|
|
||||||
/* Include our own version of umount2 if we need it... */
|
#ifndef MNT_FORCE
|
||||||
|
#define MNT_FORCE 1
|
||||||
|
#endif
|
||||||
|
#ifndef MS_MGC_VAL
|
||||||
|
#define MS_MGC_VAL 0xc0ed0000 /* Magic number indicatng "new" flags */
|
||||||
|
#endif
|
||||||
|
#ifndef MS_REMOUNT
|
||||||
|
#define MS_REMOUNT 32 /* Alter flags of a mounted FS. */
|
||||||
|
#endif
|
||||||
|
#ifndef MS_RDONLY
|
||||||
|
#define MS_RDONLY 1 /* Mount read-only. */
|
||||||
|
#endif
|
||||||
#ifndef __NR_umount2
|
#ifndef __NR_umount2
|
||||||
#define __NR_umount2 52
|
#define __NR_umount2 52
|
||||||
#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. */
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* 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 _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);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static const char umount_usage[] =
|
static const char umount_usage[] =
|
||||||
|
@ -26,20 +26,32 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <mntent.h>
|
#include <mntent.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <sys/mount.h>
|
|
||||||
#include <linux/unistd.h>
|
#include <linux/unistd.h>
|
||||||
|
|
||||||
|
|
||||||
/* Include our own version of umount2 if we need it... */
|
#ifndef MNT_FORCE
|
||||||
|
#define MNT_FORCE 1
|
||||||
|
#endif
|
||||||
|
#ifndef MS_MGC_VAL
|
||||||
|
#define MS_MGC_VAL 0xc0ed0000 /* Magic number indicatng "new" flags */
|
||||||
|
#endif
|
||||||
|
#ifndef MS_REMOUNT
|
||||||
|
#define MS_REMOUNT 32 /* Alter flags of a mounted FS. */
|
||||||
|
#endif
|
||||||
|
#ifndef MS_RDONLY
|
||||||
|
#define MS_RDONLY 1 /* Mount read-only. */
|
||||||
|
#endif
|
||||||
#ifndef __NR_umount2
|
#ifndef __NR_umount2
|
||||||
#define __NR_umount2 52
|
#define __NR_umount2 52
|
||||||
#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. */
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* 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 _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);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static const char umount_usage[] =
|
static const char umount_usage[] =
|
||||||
|
Loading…
Reference in New Issue
Block a user