summaryrefslogtreecommitdiff
path: root/util-linux/mount.c
diff options
context:
space:
mode:
authorEric Andersen2001-02-01 22:43:49 +0000
committerEric Andersen2001-02-01 22:43:49 +0000
commitaf4ac77d9d13f879922ccad8a8535c24aeea0380 (patch)
tree47dca5ab2df8982ea929c902216bca6bf9c31f44 /util-linux/mount.c
parentb5c29850e31ca41ee643cfe62eb8bc5f8682deb1 (diff)
downloadbusybox-af4ac77d9d13f879922ccad8a8535c24aeea0380.zip
busybox-af4ac77d9d13f879922ccad8a8535c24aeea0380.tar.gz
Apply a patch from Larry Doolittle to add "-all" and "-none" switches
to multibuild.pl. I did a little formatting adjustments to make it _very_ obvious when things stop working. I also removed the USE_PROCFS config option -- just do the right thing when USE_DEVPS_PATCH is enabled. -Erik
Diffstat (limited to 'util-linux/mount.c')
-rw-r--r--util-linux/mount.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index b571e50..79813ba 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -232,13 +232,9 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
{
int status = 0;
-#if defined BB_FEATURE_USE_PROCFS
char buf[255];
if (strcmp(filesystemType, "auto") == 0) {
- FILE *f = fopen("/proc/filesystems", "r");
-
- if (f == NULL)
- return (FALSE);
+ FILE *f = xfopen("/proc/filesystems", "r");
while (fgets(buf, sizeof(buf), f) != NULL) {
filesystemType = buf;
@@ -261,7 +257,6 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
}
fclose(f);
} else
-#endif
#if defined BB_FEATURE_USE_DEVPS_PATCH
if (strcmp(filesystemType, "auto") == 0) {
int fd, i, numfilesystems;