Finish off the libc5 porting effort. Everything now works with libc5

except for md5sum, which uses the GNU libc addition getline().
 -Erik

diff --git a/busybox.def.h b/busybox.def.h
index 3556b1e245ac90c57c189421ca273f77a53788b9..d7756a498aeb4119f8175fc90f62ba3fdd4b0cfa 100644 (file)
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -55,7 +55,7 @@
 #define BB_LSMOD
 #define BB_MAKEDEVS
 #define BB_MATH
-#define BB_MD5SUM
+//#define BB_MD5SUM
 #define BB_MKDIR
 #define BB_MKFIFO
 #define BB_MKFS_MINIX
@@ -89,7 +89,7 @@
 #define BB_TAR
 #define BB_TEE
 #define BB_TEST
-//#define BB_TELNET
+#define BB_TELNET
 #define BB_TOUCH
 #define BB_TR
 #define BB_TRUE_FALSE

diff --git a/internal.h b/internal.h
index 697ce4778e7bfe36e1f724124d680e83501afdb0..4a132abf17c73ceab7b46d5aa7da84f8ea712ff7 100644 (file)
--- a/internal.h
+++ b/internal.h
@@ -297,4 +297,13 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags,
 #endif
 
 
+#ifndef setbit
+/* Bit map related macros -- libc5 doens't provide these... sigh.  */
+#define NBBY            CHAR_BIT
+#define setbit(a,i)     ((a)[(i)/NBBY] |= 1<<((i)%NBBY))
+#define clrbit(a,i)     ((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
+#define isset(a,i)      ((a)[(i)/NBBY] & (1<<((i)%NBBY)))
+#define isclr(a,i)      (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
+#endif
+
 #endif /* _BB_INTERNAL_H_ */

diff --git a/mkfs_minix.c b/mkfs_minix.c
index c6ca754cabdebf895306075bb14d7517d2c00178..670d03a3a92072004636d8d60bc7b72595eea543 100644 (file)
--- a/mkfs_minix.c
+++ b/mkfs_minix.c
@@ -797,6 +797,6 @@ goodbye:
        }
        mark_good_blocks();
        write_tables();
-       exit( 0);
+       return( 0);
 
 }

diff --git a/umount.c b/umount.c
index 4aed989fb730495492c0d44dc01976c15eff479e..61f7f902803bc53c66a9e1e57872cbe160f2a1de 100644 (file)
--- a/umount.c
+++ b/umount.c
@@ -24,12 +24,12 @@
 
 #include "internal.h"
 #include <stdio.h>
-//#include <sys/mount.h>
 #include <mntent.h>
 #include <errno.h>
 #include <linux/unistd.h>
 
 
+//#include <sys/mount.h>
 /* Include our own version of sys/mount.h, since libc5 doesn't
  * know about umount2 */
 static _syscall1(int, umount, const char *, special_file);

diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index c6ca754cabdebf895306075bb14d7517d2c00178..670d03a3a92072004636d8d60bc7b72595eea543 100644 (file)
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -797,6 +797,6 @@ goodbye:
        }
        mark_good_blocks();
        write_tables();
-       exit( 0);
+       return( 0);
 
 }

diff --git a/util-linux/umount.c b/util-linux/umount.c
index 4aed989fb730495492c0d44dc01976c15eff479e..61f7f902803bc53c66a9e1e57872cbe160f2a1de 100644 (file)
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -24,12 +24,12 @@
 
 #include "internal.h"
 #include <stdio.h>
-//#include <sys/mount.h>
 #include <mntent.h>
 #include <errno.h>
 #include <linux/unistd.h>
 
 
+//#include <sys/mount.h>
 /* Include our own version of sys/mount.h, since libc5 doesn't
  * know about umount2 */
 static _syscall1(int, umount, const char *, special_file);