[BusyBox-cvs] busybox/libbb Makefile.in, 1.23, 1.24 interface.c, 1.16, 1.17 module_syscalls.c, 1.12, 1.13 syscalls.c, 1.11, 1.12 dirname.c, 1.6, NONE libc5.c, 1.6, NONE

[Erik Andersen]

Update of /var/cvs/busybox/libbb
In directory winder:/tmp/cvs-serv29080/libbb

Modified Files:
	Makefile.in interface.c module_syscalls.c syscalls.c 
Removed Files:
	dirname.c libc5.c 
Log Message:
Remove remaining libc5 support code


Index: Makefile.in
===================================================================
RCS file: /var/cvs/busybox/libbb/Makefile.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile.in	14 Jul 2003 21:20:55 -0000	1.23
+++ Makefile.in	22 Jul 2003 08:56:46 -0000	1.24
@@ -27,12 +27,12 @@
 	arith.c bb_asprintf.c ask_confirmation.c change_identity.c chomp.c \
 	compare_string_array.c concat_path_file.c copy_file.c \
 	copyfd.c correct_password.c create_icmp_socket.c \
-	create_icmp6_socket.c device_open.c dirname.c dump.c error_msg.c \
+	create_icmp6_socket.c device_open.c dump.c error_msg.c \
 	error_msg_and_die.c find_mount_point.c find_pid_by_name.c \
 	find_root_device.c fgets_str.c full_read.c full_write.c get_console.c \
 	get_last_path_component.c get_line_from_file.c herror_msg.c \
 	herror_msg_and_die.c human_readable.c inet_common.c inode_hash.c \
-	interface.c isdirectory.c kernel_version.c last_char_is.c libc5.c \
+	interface.c isdirectory.c kernel_version.c last_char_is.c \
 	llist_add_to.c login.c loop.c make_directory.c mode_string.c \
 	module_syscalls.c mtab.c mtab_file.c my_getgrgid.c my_getgrnam.c \
 	my_getpwnam.c my_getpwnamegid.c my_getpwuid.c obscure.c parse_mode.c \

Index: interface.c
===================================================================
RCS file: /var/cvs/busybox/libbb/interface.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- interface.c	14 Jul 2003 21:20:55 -0000	1.16
+++ interface.c	22 Jul 2003 08:56:46 -0000	1.17
@@ -76,6 +76,7 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <sys/ioctl.h>
+#include <sys/types.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include "libbb.h"
@@ -87,10 +88,6 @@
 #define KRELEASE(maj,min,patch) ((maj) * 65536 + (min)*256 + (patch))
 
 static int procnetdev_vsn = 1;
-
-/* Ugh.  But libc5 doesn't provide POSIX types.  */
-#include <asm/types.h>
-
 
 #ifdef HAVE_HWSLIP
 #include <net/if_slip.h>

Index: module_syscalls.c
===================================================================
RCS file: /var/cvs/busybox/libbb/module_syscalls.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- module_syscalls.c	14 Jul 2003 21:20:55 -0000	1.12
+++ module_syscalls.c	22 Jul 2003 08:56:46 -0000	1.13
@@ -27,15 +27,11 @@
    _syscall* defined.  */
 #define __LIBRARY__
 #include <sys/syscall.h>
-#if __GNU_LIBRARY__ < 5
-/* This is needed for libc5 */
-#include <asm/unistd.h>
-#endif
 #include "libbb.h"
 
 
-#if __GNU_LIBRARY__ < 5 || ((__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1))
-/* These syscalls are not included as part of libc5 */
+/* These syscalls are not included in very old glibc versions */
+#if ((__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1))
 int delete_module(const char *name)
 {
     return(syscall(__NR_delete_module, name));
@@ -79,7 +75,7 @@
     return ret;
 }
 
-#endif /* __GNU_LIBRARY__ < 5 */
+#endif
 
 
 /* END CODE */

Index: syscalls.c
===================================================================
RCS file: /var/cvs/busybox/libbb/syscalls.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- syscalls.c	14 Jul 2003 21:20:56 -0000	1.11
+++ syscalls.c	22 Jul 2003 08:56:46 -0000	1.12
@@ -27,10 +27,6 @@
    _syscall* defined.  */
 #define __LIBRARY__
 #include <sys/syscall.h>
-#if __GNU_LIBRARY__ < 5
-/* This is needed for libc5 */
-#include <asm/unistd.h>
-#endif
 #include "libbb.h"
 
 int sysfs( int option, unsigned int fs_index, char * buf)
@@ -59,9 +55,9 @@
 
 
 
-#if __GNU_LIBRARY__ < 5 || ((__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1))
+/* These syscalls are not included in ancient glibc versions */
+#if ((__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1))
 
-/* These syscalls are not included as part of libc5 */
 int bdflush(int func, int data)
 {
     return(syscall(__NR_bdflush, func, data));
@@ -96,7 +92,7 @@
 }
 
 
-#endif /* __GNU_LIBRARY__ < 5 */
+#endif
 
 
 /* END CODE */

--- dirname.c DELETED ---

--- libc5.c DELETED ---