Remove misguided klude around for 2.4.x-test* brokenness. Al Viro
will be removing this stuff from /proc/mounts real soon now I am assured. -Erik
This commit is contained in:
parent
f7cf2f7ef9
commit
89bc256c94
@ -103,9 +103,6 @@ extern int df_main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
while ((mountEntry = getmntent(mountTable))) {
|
while ((mountEntry = getmntent(mountTable))) {
|
||||||
if (strcmp(mountEntry->mnt_fsname, "none") == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
|
df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
|
||||||
}
|
}
|
||||||
endmntent(mountTable);
|
endmntent(mountTable);
|
||||||
|
3
df.c
3
df.c
@ -103,9 +103,6 @@ extern int df_main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
while ((mountEntry = getmntent(mountTable))) {
|
while ((mountEntry = getmntent(mountTable))) {
|
||||||
if (strcmp(mountEntry->mnt_fsname, "none") == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
|
df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
|
||||||
}
|
}
|
||||||
endmntent(mountTable);
|
endmntent(mountTable);
|
||||||
|
8
mount.c
8
mount.c
@ -358,10 +358,6 @@ extern int mount_main(int argc, char **argv)
|
|||||||
fatalError( "\nDEVMTAB_GET_MOUNTS: %s\n", strerror (errno));
|
fatalError( "\nDEVMTAB_GET_MOUNTS: %s\n", strerror (errno));
|
||||||
|
|
||||||
for( i = 0 ; i < numfilesystems ; i++) {
|
for( i = 0 ; i < numfilesystems ; i++) {
|
||||||
/* klude around Linux 2.4.x stupidity */
|
|
||||||
if (strcmp(mntentlist[i].mnt_fsname, "none") == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
fprintf( stdout, "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
|
fprintf( stdout, "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
|
||||||
mntentlist[i].mnt_dir, mntentlist[i].mnt_type,
|
mntentlist[i].mnt_dir, mntentlist[i].mnt_type,
|
||||||
mntentlist[i].mnt_opts, mntentlist[i].mnt_freq,
|
mntentlist[i].mnt_opts, mntentlist[i].mnt_freq,
|
||||||
@ -384,10 +380,6 @@ extern int mount_main(int argc, char **argv)
|
|||||||
|
|
||||||
while ((m = getmntent(mountTable)) != 0) {
|
while ((m = getmntent(mountTable)) != 0) {
|
||||||
char *blockDevice = m->mnt_fsname;
|
char *blockDevice = m->mnt_fsname;
|
||||||
/* klude around Linux 2.4.x stupidity */
|
|
||||||
if (strcmp(blockDevice, "none") == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (strcmp(blockDevice, "/dev/root") == 0) {
|
if (strcmp(blockDevice, "/dev/root") == 0) {
|
||||||
find_real_root_device_name( blockDevice);
|
find_real_root_device_name( blockDevice);
|
||||||
}
|
}
|
||||||
|
@ -358,10 +358,6 @@ extern int mount_main(int argc, char **argv)
|
|||||||
fatalError( "\nDEVMTAB_GET_MOUNTS: %s\n", strerror (errno));
|
fatalError( "\nDEVMTAB_GET_MOUNTS: %s\n", strerror (errno));
|
||||||
|
|
||||||
for( i = 0 ; i < numfilesystems ; i++) {
|
for( i = 0 ; i < numfilesystems ; i++) {
|
||||||
/* klude around Linux 2.4.x stupidity */
|
|
||||||
if (strcmp(mntentlist[i].mnt_fsname, "none") == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
fprintf( stdout, "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
|
fprintf( stdout, "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
|
||||||
mntentlist[i].mnt_dir, mntentlist[i].mnt_type,
|
mntentlist[i].mnt_dir, mntentlist[i].mnt_type,
|
||||||
mntentlist[i].mnt_opts, mntentlist[i].mnt_freq,
|
mntentlist[i].mnt_opts, mntentlist[i].mnt_freq,
|
||||||
@ -384,10 +380,6 @@ extern int mount_main(int argc, char **argv)
|
|||||||
|
|
||||||
while ((m = getmntent(mountTable)) != 0) {
|
while ((m = getmntent(mountTable)) != 0) {
|
||||||
char *blockDevice = m->mnt_fsname;
|
char *blockDevice = m->mnt_fsname;
|
||||||
/* klude around Linux 2.4.x stupidity */
|
|
||||||
if (strcmp(blockDevice, "none") == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (strcmp(blockDevice, "/dev/root") == 0) {
|
if (strcmp(blockDevice, "/dev/root") == 0) {
|
||||||
find_real_root_device_name( blockDevice);
|
find_real_root_device_name( blockDevice);
|
||||||
}
|
}
|
||||||
|
@ -1199,9 +1199,6 @@ extern struct mntent *findMountPoint(const char *name, const char *table)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
while ((mountEntry = getmntent(mountTable)) != 0) {
|
while ((mountEntry = getmntent(mountTable)) != 0) {
|
||||||
if (strcmp(mountEntry->mnt_fsname, "none") == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (strcmp(name, mountEntry->mnt_dir) == 0
|
if (strcmp(name, mountEntry->mnt_dir) == 0
|
||||||
|| strcmp(name, mountEntry->mnt_fsname) == 0) /* String match. */
|
|| strcmp(name, mountEntry->mnt_fsname) == 0) /* String match. */
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user