[BusyBox-cvs] busybox/miscutils adjtimex.c, 1.4, 1.5 dutmp.c, 1.30, 1.31 update.c, 1.24, 1.25

[Erik Andersen]

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

Modified Files:
	adjtimex.c dutmp.c update.c 
Log Message:
Remove remaining libc5 support code


Index: adjtimex.c
===================================================================
RCS file: /var/cvs/busybox/miscutils/adjtimex.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adjtimex.c	19 Mar 2003 09:12:28 -0000	1.4
+++ adjtimex.c	22 Jul 2003 08:56:49 -0000	1.5
@@ -44,14 +44,7 @@
 #include <sys/types.h>
 #include <stdlib.h>
 #include <unistd.h>
-
-#if __GNU_LIBRARY__ < 5
 #include <sys/timex.h>
-extern int adjtimex(struct timex *buf);
-#else
-#include <sys/timex.h>
-#endif
-
 #include "busybox.h"
 
 static struct {int bit; char *name;} statlist[] = {

Index: dutmp.c
===================================================================
RCS file: /var/cvs/busybox/miscutils/dutmp.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- dutmp.c	19 Mar 2003 09:12:28 -0000	1.30
+++ dutmp.c	22 Jul 2003 08:56:49 -0000	1.31
@@ -28,13 +28,9 @@
  * Do what we can while still keeping this reasonably small.
  * Note: We are assuming the ut_id[] size is fixed at 4. */
 
-#if __GNU_LIBRARY__ < 5
-#warning the format string needs to be changed
-#else
 #if (UT_LINESIZE != 32) || (UT_NAMESIZE != 32) || (UT_HOSTSIZE != 256)
 #error struct utmp member char[] size(s) have changed!
 #endif
-#endif
 
 extern int dutmp_main(int argc, char **argv)
 {
@@ -57,18 +53,6 @@
 			bb_perror_msg_and_die("short read");
 		}
 
-		/* Kludge around the fact that the binary format for utmp has changed. */
-#if __GNU_LIBRARY__ < 5
-		/* Linux libc5 */
-
-		bb_printf("%d|%d|%s|%s|%s|%s|%s|%lx\n",
-				  ut.ut_type, ut.ut_pid, ut.ut_line,
-				  ut.ut_id, ut.ut_user, ut.ut_host,
-				  ctime(&(ut.ut_time)), 
-				  (long)ut.ut_addr);
-#else
-		/* Glibc, uClibc, etc. */
-
 		bb_printf("%d|%d|%.32s|%.4s|%.32s|%.256s|%d|%d|%ld|%ld|%ld|%x\n",
 				  ut.ut_type, ut.ut_pid, ut.ut_line,
 				  ut.ut_id, ut.ut_user,	ut.ut_host,
@@ -76,7 +60,6 @@
 				  ut.ut_session,
 				  ut.ut_tv.tv_sec, ut.ut_tv.tv_usec,
 				  ut.ut_addr);
-#endif
 	}
 
 	bb_fflush_stdout_and_exit(EXIT_SUCCESS);

Index: update.c
===================================================================
RCS file: /var/cvs/busybox/miscutils/update.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- update.c	19 Mar 2003 09:12:29 -0000	1.24
+++ update.c	22 Jul 2003 08:56:49 -0000	1.25
@@ -32,12 +32,7 @@
 #include <sys/syslog.h>
 #include <unistd.h> /* for getopt() */
 #include <stdlib.h>
-
-#if __GNU_LIBRARY__ > 5
-	#include <sys/kdaemon.h>
-#else
-	extern int bdflush (int func, long int data);
-#endif
+#include <sys/kdaemon.h>
 
 #include "busybox.h"