Fix up some silly macros and use xmalloc and friends exclusively.

[oweals/busybox.git] / dutmp.c

diff --git a/dutmp.c b/dutmp.c
index f264fd75bfbd8c01808b5d215a655704acbca3f5..a75a6e3922fbbe1b1a10ac2e916be11d972be45b 100644 (file)
--- a/dutmp.c
+++ b/dutmp.c
@@ -8,28 +8,21 @@
  * versions of 'who', 'last', etc. IP Addr is output in hex, 
  * little endian on x86.
  * 
- * Modified to support all sort of libcs by 
+ * Modified to support all sorts of libcs by 
  * Erik Andersen <andersen@lineo.com>
  */
 
-#include "internal.h"
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 
 #include <errno.h>
+#include <utmp.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_io_error
 #include "messages.c"
-#include <utmp.h>
-
-
-static const char dutmp_usage[] = "dutmp [FILE]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nDump utmp file format (pipe delimited) from FILE\n"
-       "or stdin to stdout.  (i.e. 'dutmp /var/run/utmp')\n"
-#endif
-       ;
 
 extern int dutmp_main(int argc, char **argv)
 {
@@ -40,14 +33,19 @@ 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) {
-                       fatalError(io_error, argv[1], strerror(errno));
+                       perror_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__
        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,
@@ -55,6 +53,16 @@ extern int dutmp_main(int argc, char **argv)
                                ctime(&(ut.ut_time)), 
                                (long)ut.ut_addr);
        }
-
-       exit(TRUE);
+#else
+       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,
+               ut.ut_id, ut.ut_user,   ut.ut_host,
+               ut.ut_exit.e_termination, ut.ut_exit.e_exit,
+               ut.ut_session,
+               ut.ut_tv.tv_sec, ut.ut_tv.tv_usec,
+               ut.ut_addr);
+       }
+#endif
+       return EXIT_SUCCESS;
 }