Another small formatting change from Larry Doolittle.

[oweals/busybox.git] / dutmp.c

diff --git a/dutmp.c b/dutmp.c
index a9e879dafc1a735a63f54768acdc4ed9f6e77c65..2e6b3c05660977e83bcc0172c1b20862e48d2275 100644 (file)
--- a/dutmp.c
+++ b/dutmp.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * public domain -- Dave 'Kill a Cop' Cinege <dcinege@psychosis.com>
  * 
@@ -7,45 +8,61 @@
  * versions of 'who', 'last', etc. IP Addr is output in hex, 
  * little endian on x86.
  * 
- * made against libc6
+ * Modified to support all sorts of libcs by 
+ * Erik Andersen <andersen@lineo.com>
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <utmp.h>
+#include "busybox.h"
+#include <sys/types.h>
+#include <fcntl.h>
 
-static const char dutmp_usage[] = "dutmp\n"
-    "\n"
-    "\tDump file or stdin utmp file format to stdout, pipe delimited.\n"
-    "\tdutmp /var/run/utmp\n";
+#include <errno.h>
+#define BB_DECLARE_EXTERN
+#define bb_need_io_error
+#include "messages.c"
+#include <utmp.h>
+#include <stdlib.h>
+#include <unistd.h>
 
-extern int dutmp_main (int argc, char **argv)
+extern int dutmp_main(int argc, char **argv)
 {
 
-    FILE *f = stdin;
-    struct utmp ut;
-
-    if ((argc < 2) || (**(argv + 1) == '-')) {
-       usage( dutmp_usage);
-    }
+       int file;
+       struct utmp ut;
 
-    if ( **(++argv) == 0 ) {
-       f = fopen (*(++argv), "r");
-          if (f < 0 ) {
-               perror (*argv);
-               exit (FALSE);
-          }
-    }
+       if (argc<2) {
+               file = fileno(stdin);
+       } else if (*argv[1] == '-' ) {
+               show_usage();
+       } else  {
+               file = open(argv[1], O_RDONLY);
+               if (file < 0) {
+                       perror_msg_and_die(io_error, argv[1]);
+               }
+       }
 
-    while (fread (&ut, 1, sizeof (struct utmp), f)) {
-       // printf("%d:%d:%s:%s:%s:%s:%d:%d:%ld:%ld:%ld:%x\n", 
-       printf ("%d|%d|%s|%s|%s|%s|%d|%d|%ld|%ld|%ld|%x\n",
+/* 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,
+                               ut.ut_id, ut.ut_user, ut.ut_host,
+                               ctime(&(ut.ut_time)), 
+                               (long)ut.ut_addr);
+       }
+#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_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);
-    }
-
-    exit (TRUE);
+               ut.ut_tv.tv_sec, ut.ut_tv.tv_usec,
+               ut.ut_addr);
+       }
+#endif
+       return EXIT_SUCCESS;
 }