dont use the -i option of xargs

[oweals/busybox.git] / miscutils / dutmp.c

diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c
index a75a6e3922fbbe1b1a10ac2e916be11d972be45b..19e09fbb0a178dbb5c79988b2449a828acf54a58 100644 (file)
--- 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,15 +34,13 @@ 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, and the
- * fact the stupid libc doesn't have a reliable #define to announce that libc5
- * is being used.  sigh.
- */
-#if ! defined __GLIBC__ || defined __UCLIBC__
+/* Kludge around the fact that the binary format for utmp has changed. */
+#if __GNU_LIBRARY__ < 5
+       /* Linux libc5 */
        while (read(file, (void*)&ut, sizeof(struct utmp))) {
                printf("%d|%d|%s|%s|%s|%s|%s|%lx\n",
                                ut.ut_type, ut.ut_pid, ut.ut_line,
@@ -54,6 +49,7 @@ extern int dutmp_main(int argc, char **argv)
                                (long)ut.ut_addr);
        }
 #else
+       /* 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,