From af4ac77d9d13f879922ccad8a8535c24aeea0380 Mon Sep 17 00:00:00 2001
From: Eric Andersen
Date: Thu, 1 Feb 2001 22:43:49 +0000
Subject: 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

---
 util-linux/more.c  | 1 +
 util-linux/mount.c | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'util-linux')

diff --git a/util-linux/more.c b/util-linux/more.c
index c4c74fe..15c3b6f 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -1,3 +1,4 @@
+#error Foo
 /* vi: set sw=4 ts=4: */
 /*
  * Mini more implementation for busybox
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;
-- 
cgit v1.1