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

Dont try and automount devfs, rename some variables

Browse Source
This commit is contained in:
Glenn L McGrath 2001-03-30 01:28:13 +00:00
parent 84e229cfbe
commit 1e117b4752
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mount.c
View File

@ -231,7 +231,7 @@ parse_mount_options(char *options, int *flags, char *strflags)
} }
} }
static int extern int
mount_one(char *blockDevice, char *directory, char *filesystemType, mount_one(char *blockDevice, char *directory, char *filesystemType,
unsigned long flags, char *string_flags, int useMtab, int fakeIt, unsigned long flags, char *string_flags, int useMtab, int fakeIt,
char *mtab_opts, int whineOnErrors) char *mtab_opts, int whineOnErrors)
@ -239,8 +239,8 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
int status = 0; int status = 0;
if (strcmp(filesystemType, "auto") == 0) { if (strcmp(filesystemType, "auto") == 0) {
static const char *strings[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", 0 }; static const char *noauto_array[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", 0 };
const char** nodevfss; const char **noauto_fstype;
const int num_of_filesystems = sysfs(3, 0, 0); const int num_of_filesystems = sysfs(3, 0, 0);
char buf[255]; char buf[255];
int i=0; int i=0;
@ -249,12 +249,12 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
while(i < num_of_filesystems) { while(i < num_of_filesystems) {
sysfs(2, i++, filesystemType); sysfs(2, i++, filesystemType);
for (nodevfss = strings; *nodevfss; nodevfss++) { for (noauto_fstype = noauto_array; *noauto_fstype; noauto_fstype++) {
if (!strcmp(filesystemType, *nodevfss)) { if (!strcmp(filesystemType, *noauto_fstype)) {
break; break;
} }
} }
if (!*nodevfss) { if (!*noauto_fstype) {
status = do_mount(blockDevice, directory, filesystemType, status = do_mount(blockDevice, directory, filesystemType,
flags | MS_MGC_VAL, string_flags, flags | MS_MGC_VAL, string_flags,
useMtab, fakeIt, mtab_opts); useMtab, fakeIt, mtab_opts);

12
util-linux/mount.c
View File

@ -231,7 +231,7 @@ parse_mount_options(char *options, int *flags, char *strflags)
} }
} }
static int extern int
mount_one(char *blockDevice, char *directory, char *filesystemType, mount_one(char *blockDevice, char *directory, char *filesystemType,
unsigned long flags, char *string_flags, int useMtab, int fakeIt, unsigned long flags, char *string_flags, int useMtab, int fakeIt,
char *mtab_opts, int whineOnErrors) char *mtab_opts, int whineOnErrors)
@ -239,8 +239,8 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
int status = 0; int status = 0;
if (strcmp(filesystemType, "auto") == 0) { if (strcmp(filesystemType, "auto") == 0) {
static const char *strings[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", 0 }; static const char *noauto_array[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", 0 };
const char** nodevfss; const char **noauto_fstype;
const int num_of_filesystems = sysfs(3, 0, 0); const int num_of_filesystems = sysfs(3, 0, 0);
char buf[255]; char buf[255];
int i=0; int i=0;
@ -249,12 +249,12 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
while(i < num_of_filesystems) { while(i < num_of_filesystems) {
sysfs(2, i++, filesystemType); sysfs(2, i++, filesystemType);
for (nodevfss = strings; *nodevfss; nodevfss++) { for (noauto_fstype = noauto_array; *noauto_fstype; noauto_fstype++) {
if (!strcmp(filesystemType, *nodevfss)) { if (!strcmp(filesystemType, *noauto_fstype)) {
break; break;
} }
} }
if (!*nodevfss) { if (!*noauto_fstype) {
status = do_mount(blockDevice, directory, filesystemType, status = do_mount(blockDevice, directory, filesystemType,
flags | MS_MGC_VAL, string_flags, flags | MS_MGC_VAL, string_flags,
useMtab, fakeIt, mtab_opts); useMtab, fakeIt, mtab_opts);