Simplified version checking.

[oweals/busybox.git] / dutmp.c

diff --git a/dutmp.c b/dutmp.c
index 7e1d2eed75bdfe565281c16c86f0751da42e76d4..df7f64d30dfaaff27a573443263d7a57e5b618c5 100644 (file)
--- a/dutmp.c
+++ b/dutmp.c
@@ -12,17 +12,14 @@
  * Erik Andersen <andersen@lineo.com>
  */
 
-#include "busybox.h"
 #include <sys/types.h>
 #include <fcntl.h>
 
 #include <errno.h>
-#define BB_DECLARE_EXTERN
-#define bb_need_io_error
-#include "messages.c"
 #include <utmp.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include "busybox.h"
 
 extern int dutmp_main(int argc, char **argv)
 {
@@ -33,7 +30,7 @@ extern int dutmp_main(int argc, char **argv)
        if (argc<2) {
                file = fileno(stdin);
        } else if (*argv[1] == '-' ) {
-               usage(dutmp_usage);
+               show_usage();
        } else  {
                file = open(argv[1], O_RDONLY);
                if (file < 0) {
@@ -41,11 +38,9 @@ extern int dutmp_main(int argc, char **argv)
                }
        }
 
-/* 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__
+/* Kludge around the fact that the binary format for utmp has changed. */
+#if __GNU_LIBRARY__ < 5 || defined __UCLIBC__
+       /* 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,