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 e92b6700f5bc0aaf1dfc7ce8bc0e7e7b4a473309..a75a6e3922fbbe1b1a10ac2e916be11d972be45b 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,41 +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>
 
-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 <sys/types.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"
 
-extern int
-dutmp_fn(const struct FileInfo * i)
+extern int dutmp_main(int argc, char **argv)
 {
 
-FILE * f = stdin;
-struct utmp * ut = (struct utmp *) malloc(sizeof(struct utmp) );
+       int file;
+       struct utmp ut;
 
-       if ( i ) 
-               if (! (f = fopen(i->source, "r"))) {
-                       name_and_error(i->source);
-                       return 1;
+       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", 
+/* 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_exit.e_termination, ut->ut_exit.e_exit,
-               ut->ut_session,
-               ut->ut_tv.tv_sec, ut->ut_tv.tv_usec,
-               ut->ut_addr);
+               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);
        }
-
-return 0;      
+#endif
+       return EXIT_SUCCESS;
 }