diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-02-01 22:43:49 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-02-01 22:43:49 +0000 |
| commit | af4ac77d9d13f879922ccad8a8535c24aeea0380 (patch) | |
| tree | 47dca5ab2df8982ea929c902216bca6bf9c31f44 /mount.c | |
| parent | b5c29850e31ca41ee643cfe62eb8bc5f8682deb1 (diff) | |
| download | busybox-w32-af4ac77d9d13f879922ccad8a8535c24aeea0380.tar.gz busybox-w32-af4ac77d9d13f879922ccad8a8535c24aeea0380.tar.bz2 busybox-w32-af4ac77d9d13f879922ccad8a8535c24aeea0380.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
Diffstat (limited to 'mount.c')
| -rw-r--r-- | mount.c | 7 |
1 files changed, 1 insertions, 6 deletions
| @@ -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; |