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

diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c
index f264fd75b..19e09fbb0 100644
--- a/miscutils/dutmp.c
+++ b/miscutils/dutmp.c
@@ -8,28 +8,18 @@
  * 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>
-#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
-	;
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+#include "busybox.h"
 
 extern int dutmp_main(int argc, char **argv)
 {
@@ -40,14 +30,17 @@ 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));
+			error_msg_and_die(io_error, argv[1]);
 		}
 	}
 
+/* 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,
@@ -55,6 +48,17 @@ extern int dutmp_main(int argc, char **argv)
 				ctime(&(ut.ut_time)), 
 				(long)ut.ut_addr);
 	}
-
-	exit(TRUE);
+#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_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;
 }