This commit is contained in:
Eric Andersen
1999-12-05 23:24:55 +00:00
parent 14ec6cf3c2
commit 0ecb54a0f3
12 changed files with 66 additions and 61 deletions

15
mtab.c
View File

@ -26,8 +26,14 @@ erase_mtab(const char * name)
FILE *mountTable = setmntent(mtab_file, "r");
struct mntent * m;
if ( mountTable == 0
&& (mountTable = setmntent("/proc/mounts", "r")) == 0 ) {
/* Check if reading the mtab file failed */
if ( mountTable == 0
#if ! defined BB_FEATURE_USE_PROCFS
) {
#else
/* Bummer. fall back on trying the /proc filesystem */
&& (mountTable = setmntent("/proc/mounts", "r")) == 0 ) {
#endif
perror(mtab_file);
return;
}
@ -76,13 +82,14 @@ write_mtab(char* blockDevice, char* directory,
if ( length > 1 && directory[length - 1] == '/' )
directory[length - 1] = '\0';
#ifdef BB_FEATURE_USE_PROCFS
if ( filesystemType == 0 ) {
struct mntent * p
= findMountPoint(blockDevice, "/proc/mounts");
struct mntent *p = findMountPoint(blockDevice, "/proc/mounts");
if ( p && p->mnt_type )
filesystemType = p->mnt_type;
}
#endif
m.mnt_fsname = blockDevice;
m.mnt_dir = directory;
m.mnt_type = filesystemType ? filesystemType : "default";