X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fdutmp.c;h=19e09fbb0a178dbb5c79988b2449a828acf54a58;hb=83bcba26c01d945d1964d6d5de715a2356a858cf;hp=c5307b638c84a4ac66ecdbc46ecc15253eab4752;hpb=e77ae3a2c0328590b43447550bdb1284650b8236;p=oweals%2Fbusybox.git

diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c
index c5307b638..19e09fbb0 100644
--- a/miscutils/dutmp.c
+++ b/miscutils/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,57 @@
  * 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 <sys/types.h>
+#include <fcntl.h>
+#include <errno.h>
 #include <utmp.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+#include "busybox.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";
-
-static 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) {
+			error_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. */
+#if __GNU_LIBRARY__ < 5
+	/* 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,
+				ut.ut_id, ut.ut_user, ut.ut_host,
+				ctime(&(ut.ut_time)), 
+				(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,
-		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;
 }