diff options
| author | Eric Andersen <andersen@codepoet.org> | 2000-06-19 20:03:48 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2000-06-19 20:03:48 +0000 |
| commit | bd4a75f6c8e3c821a45f136eb6c21e71aa1450be (patch) | |
| tree | fe8cf4622b7973cae5614de2da32a6a7bd24aedb | |
| parent | bb245ba0c2238d6a6b19af151249cdb25afdca87 (diff) | |
| download | busybox-bd4a75f6c8e3c821a45f136eb6c21e71aa1450be.tar.gz | |
Finish off the libc5 porting effort. Everything now works with libc5
except for md5sum, which uses the GNU libc addition getline().
-Erik
| -rw-r--r-- | busybox.def.h | 4 | ||||
| -rw-r--r-- | internal.h | 9 | ||||
| -rw-r--r-- | mkfs_minix.c | 2 | ||||
| -rw-r--r-- | umount.c | 2 | ||||
| -rw-r--r-- | util-linux/mkfs_minix.c | 2 | ||||
| -rw-r--r-- | util-linux/umount.c | 2 |
6 files changed, 15 insertions, 6 deletions
diff --git a/busybox.def.h b/busybox.def.h index 3556b1e24..d7756a498 100644 --- 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 697ce4778..4a132abf1 100644 --- 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 c6ca754ca..670d03a3a 100644 --- a/mkfs_minix.c +++ b/mkfs_minix.c @@ -797,6 +797,6 @@ goodbye: } mark_good_blocks(); write_tables(); - exit( 0); + return( 0); } @@ -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 c6ca754ca..670d03a3a 100644 --- 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 4aed989fb..61f7f9028 100644 --- 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); |