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


git-svn-id: svn://busybox.net/trunk/busybox@701 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 20 insertions, 1 deletions

diff --git a/internal.h b/internal.h
index 127460fc6..c39dfde62 100644
--- a/internal.h
+++ b/internal.h
@@ -30,6 +30,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <mntent.h>
@@ -296,9 +297,27 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags,
 #define RB_POWER_OFF   0x4321fedc
 #endif
 
+/* Include our own copy of struct sysinfo to avoid binary compatability
+ * problems with Linux 2.4, which changed things.  Grumble, grumble. */
+struct sysinfo {
+        long uptime;                    /* Seconds since boot */
+        unsigned long loads[3];         /* 1, 5, and 15 minute load averages */
+        unsigned long totalram;         /* Total usable main memory size */
+        unsigned long freeram;          /* Available memory size */
+        unsigned long sharedram;        /* Amount of shared memory */
+        unsigned long bufferram;        /* Memory used by buffers */
+        unsigned long totalswap;        /* Total swap space size */
+        unsigned long freeswap;         /* swap space still available */
+        unsigned short procs;           /* Number of current processes */
+        unsigned long totalhigh;        /* Total high memory size */
+        unsigned long freehigh;         /* Available high memory size */
+        unsigned int mem_unit;          /* Memory unit size in bytes */
+        char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */
+};
+extern int sysinfo (struct sysinfo* info);
 
-#ifndef setbit
 /* Bit map related macros -- libc5 doens't provide these... sigh.  */
+#ifndef setbit
 #define NBBY            CHAR_BIT
 #define setbit(a,i)     ((a)[(i)/NBBY] |= 1<<((i)%NBBY))
 #define clrbit(a,i)     ((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))