projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
copy_file_chunk uses streams now.
[oweals/busybox.git]
/
mount.c
diff --git
a/mount.c
b/mount.c
index 9f7ac43c15135aafa4f6d99a83efcb3b1fedc20d..5b6ec1e71ff64c834e8858878f84dfe42666eb0c 100644
(file)
--- a/
mount.c
+++ b/
mount.c
@@
-84,11
+84,7
@@
extern int mount (__const char *__special_file, __const char *__dir,
extern int umount (__const char *__special_file);
extern int umount2 (__const char *__special_file, int __flags);
extern int umount (__const char *__special_file);
extern int umount2 (__const char *__special_file, int __flags);
-#include <sys/syscall.h>
-#include <linux/unistd.h>
-static int sysfs( int option, unsigned int fs_index, char * buf);
-_syscall3(int, sysfs, int, option, unsigned int, fs_index, char *, buf);
-
+extern int sysfs( int option, unsigned int fs_index, char * buf);
extern const char mtab_file[]; /* Defined in utility.c */
extern const char mtab_file[]; /* Defined in utility.c */
@@
-160,7
+156,7
@@
do_mount(char *specialfile, char *dir, char *filesystemtype,
/* If the mount was sucessful, do anything needed, then return TRUE */
if (status == 0 || fakeIt==TRUE) {
/* If the mount was sucessful, do anything needed, then return TRUE */
if (status == 0 || fakeIt==TRUE) {
-#if defined BB_
MTAB
+#if defined BB_
FEATURE_MTAB_SUPPORT
if (useMtab == TRUE) {
erase_mtab(specialfile); // Clean any stale entries
write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
if (useMtab == TRUE) {
erase_mtab(specialfile); // Clean any stale entries
write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
@@
-385,7
+381,7
@@
extern int mount_main(int argc, char **argv)
case 'f':
fakeIt = TRUE;
break;
case 'f':
fakeIt = TRUE;
break;
-#ifdef BB_
MTAB
+#ifdef BB_
FEATURE_MTAB_SUPPORT
case 'n':
useMtab = FALSE;
break;
case 'n':
useMtab = FALSE;
break;