X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fdutmp.c;h=19e09fbb0a178dbb5c79988b2449a828acf54a58;hb=83bcba26c01d945d1964d6d5de715a2356a858cf;hp=df5ee13fb59e5faa2a578ec3e1749db569d41c4d;hpb=e703f7ed4204c0e73dbc72be18a3234cc4eba97b;p=oweals%2Fbusybox.git

diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c
index df5ee13fb..19e09fbb0 100644
--- a/miscutils/dutmp.c
+++ b/miscutils/dutmp.c
@@ -14,15 +14,12 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-
 #include <errno.h>
 #include <utmp.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <time.h>
 #include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_io_error
-#include "messages.c"
 
 extern int dutmp_main(int argc, char **argv)
 {
@@ -37,12 +34,12 @@ extern int dutmp_main(int argc, char **argv)
 	} else  {
 		file = open(argv[1], O_RDONLY);
 		if (file < 0) {
-			perror_msg_and_die(io_error, argv[1]);
+			error_msg_and_die(io_error, argv[1]);
 		}
 	}
 
 /* Kludge around the fact that the binary format for utmp has changed. */
-#if __GNU_LIBRARY__ < 5 || defined __UCLIBC__
+#if __GNU_LIBRARY__ < 5
 	/* Linux libc5 */
 	while (read(file, (void*)&ut, sizeof(struct utmp))) {
 		printf("%d|%d|%s|%s|%s|%s|%s|%lx\n",
@@ -52,7 +49,7 @@ extern int dutmp_main(int argc, char **argv)
 				(long)ut.ut_addr);
 	}
 #else
-	/* Glibc, uClibc, etc */
+	/* Glibc, uClibc, etc. */
 	while (read(file, (void*)&ut, sizeof(struct utmp))) {
 		printf("%d|%d|%s|%s|%s|%s|%d|%d|%ld|%ld|%ld|%x\n",
 		ut.ut_type, ut.ut_pid, ut.ut_line,