summaryrefslogtreecommitdiff
path: root/utility.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-06-26 10:45:52 +0000
committerEric Andersen <andersen@codepoet.org>2000-06-26 10:45:52 +0000
commit10dc9d4d17e6880bfdfd253716ce72ec1243227f (patch)
treef3c2aa6ab3dadf1b4bf710c7957e72faddebd75f /utility.c
parent8a24a6783af7a0d54b1f2ebcda5b07757bd19c99 (diff)
downloadbusybox-w32-10dc9d4d17e6880bfdfd253716ce72ec1243227f.tar.gz
busybox-w32-10dc9d4d17e6880bfdfd253716ce72ec1243227f.tar.bz2
busybox-w32-10dc9d4d17e6880bfdfd253716ce72ec1243227f.zip
Updates to handle Linux 2.4.0 kernels (kludged around the "none" entries in
/proc/mounts, added a hack to make sysinfo work with both old and new kernels). -Erik
Diffstat (limited to 'utility.c')
-rw-r--r--utility.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/utility.c b/utility.c
index b9c7a76cd..061ba6423 100644
--- a/utility.c
+++ b/utility.c
@@ -131,6 +131,15 @@ extern int get_kernel_revision(void)
131} 131}
132#endif /* BB_INIT */ 132#endif /* BB_INIT */
133 133
134
135
136#if defined BB_FREE || defined BB_INIT || defined BB_UNAME || defined BB_UPTIME
137#include <sys/syscall.h>
138_syscall1(int, sysinfo, struct sysinfo *, info);
139#endif /* BB_INIT */
140
141
142
134#if defined (BB_CP_MV) || defined (BB_DU) 143#if defined (BB_CP_MV) || defined (BB_DU)
135 144
136#define HASH_SIZE 311 /* Should be prime */ 145#define HASH_SIZE 311 /* Should be prime */
@@ -1189,6 +1198,9 @@ extern struct mntent *findMountPoint(const char *name, const char *table)
1189 return 0; 1198 return 0;
1190 1199
1191 while ((mountEntry = getmntent(mountTable)) != 0) { 1200 while ((mountEntry = getmntent(mountTable)) != 0) {
1201 if (strcmp(mountEntry->mnt_fsname, "none") == 0) {
1202 continue;
1203 }
1192 if (strcmp(name, mountEntry->mnt_dir) == 0 1204 if (strcmp(name, mountEntry->mnt_dir) == 0
1193 || strcmp(name, mountEntry->mnt_fsname) == 0) /* String match. */ 1205 || strcmp(name, mountEntry->mnt_fsname) == 0) /* String match. */
1194 break; 1206 break;