X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fdutmp.c;h=113f850fed7f32c1100d25693da381cfcc432ffe;hb=fbf0b8af41eb2662c40d0fb932ae85c01ea0743e;hp=e92b6700f5bc0aaf1dfc7ce8bc0e7e7b4a473309;hpb=cc8ed39b240180b58810784f844e253263594ac3;p=oweals%2Fbusybox.git

diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c
index e92b6700f..113f850fe 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,41 +8,76 @@
  * versions of 'who', 'last', etc. IP Addr is output in hex, 
  * little endian on x86.
  * 
- * made against libc6
  */
- 
-#include "internal.h"
-#include <stdio.h>
+
+/* Mar 13, 2003       Manuel Novoa III
+ *
+ * 1) Added proper error checking.
+ * 2) Allow '-' arg for stdin.
+ * 3) For modern libcs, take into account that utmp char[] members
+ *    need not be nul-terminated.
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <utmp.h>
+#include "busybox.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";
+/* Grr... utmp char[] members  do not have to be nul-terminated.
+ * Do what we can while still keeping this reasonably small.
+ * Note: We are assuming the ut_id[] size is fixed at 4. */
 
-extern int
-dutmp_fn(const struct FileInfo * i)
+#if __GNU_LIBRARY__ < 5
+#warning the format string needs to be changed
+#else
+#if (UT_LINESIZE != 32) || (UT_NAMESIZE != 32) || (UT_HOSTSIZE != 256)
+#error struct utmp member char[] size(s) have changed!
+#endif
+#endif
+
+extern int dutmp_main(int argc, char **argv)
 {
+	int file = STDIN_FILENO;
+	ssize_t n;
+	struct utmp ut;
+
+	if (argc > 2) {
+		bb_show_usage();
+	}
+	++argv;
+	if ((argc == 2) && ((argv[0][0] != '-') || argv[0][1])) {
+		file = bb_xopen(*argv, O_RDONLY);
+	}
+
 
-FILE *	f = stdin;
-struct utmp * ut = (struct utmp *) malloc(sizeof(struct utmp) );
+	while ((n = safe_read(file, (void*)&ut, sizeof(struct utmp))) != 0) {
 
-	if ( i ) 
-		if (! (f = fopen(i->source, "r"))) {
-			name_and_error(i->source);
-			return 1;
+		if (n != sizeof(struct utmp)) {
+			bb_perror_msg_and_die("short read");
 		}
 
-	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",
-		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);
+		/* Kludge around the fact that the binary format for utmp has changed. */
+#if __GNU_LIBRARY__ < 5
+		/* Linux libc5 */
+
+		bb_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. */
+
+		bb_printf("%d|%d|%.32s|%.4s|%.32s|%.256s|%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 0;	
+	bb_fflush_stdout_and_exit(EXIT_SUCCESS);
 }