Fix for dpkg-deb, courtesy of Larry Doolittle.

[oweals/busybox.git] / dutmp.c

diff --git a/dutmp.c b/dutmp.c
index 047b8805fdbec60527b44b328f659c06ec085eff..efd15dfbfb2c18a1e0d455184256a4fc64b0e6ea 100644 (file)
--- a/dutmp.c
+++ b/dutmp.c
@@ -8,13 +8,12 @@
  * 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 "busybox.h"
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 
 #include <errno.h>
@@ -36,10 +35,15 @@ extern int dutmp_main(int argc, char **argv)
        } else  {
                file = open(argv[1], O_RDONLY);
                if (file < 0) {
-                       fatalError(io_error, argv[1], strerror(errno));
+                       error_msg_and_die(io_error, argv[1], strerror(errno));
                }
        }
 
+/* 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__
        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,
@@ -47,6 +51,16 @@ extern int dutmp_main(int argc, char **argv)
                                ctime(&(ut.ut_time)), 
                                (long)ut.ut_addr);
        }
-
-       return(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;
 }