aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-02-01 22:43:49 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-02-01 22:43:49 +0000
commita773090651a1d7b61974fbd637826668e7061449 (patch)
tree47dca5ab2df8982ea929c902216bca6bf9c31f44 /util-linux
parentdeaca5da3373819de42ee9204f93fa8cfa3f48a5 (diff)
downloadbusybox-w32-a773090651a1d7b61974fbd637826668e7061449.tar.gz
busybox-w32-a773090651a1d7b61974fbd637826668e7061449.tar.bz2
busybox-w32-a773090651a1d7b61974fbd637826668e7061449.zip
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 git-svn-id: svn://busybox.net/trunk/busybox@1739 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/more.c1
-rw-r--r--util-linux/mount.c7
2 files changed, 2 insertions, 6 deletions
diff --git a/util-linux/more.c b/util-linux/more.c
index c4c74fe4a..15c3b6f87 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -1,3 +1,4 @@
1#error Foo
1/* vi: set sw=4 ts=4: */ 2/* vi: set sw=4 ts=4: */
2/* 3/*
3 * Mini more implementation for busybox 4 * Mini more implementation for busybox
diff --git a/util-linux/mount.c b/util-linux/mount.c
index b571e5035..79813ba18 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -232,13 +232,9 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
232{ 232{
233 int status = 0; 233 int status = 0;
234 234
235#if defined BB_FEATURE_USE_PROCFS
236 char buf[255]; 235 char buf[255];
237 if (strcmp(filesystemType, "auto") == 0) { 236 if (strcmp(filesystemType, "auto") == 0) {
238 FILE *f = fopen("/proc/filesystems", "r"); 237 FILE *f = xfopen("/proc/filesystems", "r");
239
240 if (f == NULL)
241 return (FALSE);
242 238
243 while (fgets(buf, sizeof(buf), f) != NULL) { 239 while (fgets(buf, sizeof(buf), f) != NULL) {
244 filesystemType = buf; 240 filesystemType = buf;
@@ -261,7 +257,6 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
261 } 257 }
262 fclose(f); 258 fclose(f);
263 } else 259 } else
264#endif
265#if defined BB_FEATURE_USE_DEVPS_PATCH 260#if defined BB_FEATURE_USE_DEVPS_PATCH
266 if (strcmp(filesystemType, "auto") == 0) { 261 if (strcmp(filesystemType, "auto") == 0) {
267 int fd, i, numfilesystems; 262 int fd, i, numfilesystems;