* 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 "busybox.h"
#define BB_DECLARE_EXTERN
#define bb_need_io_error
#include "messages.c"
-#if defined(__GLIBC__)
-#include <utmp.h>
-#else
-#include <utmp-wrap.h>
-#define utmp new_utmp
-#endif
-
-
-static const char dutmp_usage[] = "dutmp [FILE]\n\n"
- "Dump utmp file format (pipe delimited) from FILE\n"
- "or stdin to stdout. (i.e. 'dutmp /var/run/utmp')\n";
-
extern int dutmp_main(int argc, char **argv)
{
- FILE *f;
+ int file;
struct utmp ut;
if (argc<2) {
- f = stdin;
+ file = fileno(stdin);
} else if (*argv[1] == '-' ) {
- usage(dutmp_usage);
+ show_usage();
} else {
- f = fopen(argv[1], "r");
- if (f == NULL) {
- fatalError(io_error, argv[1], strerror(errno));
+ file = open(argv[1], O_RDONLY);
+ if (file < 0) {
+ perror_msg_and_die(io_error, argv[1]);
}
}
- while (fread(&ut, sizeof(struct utmp), 1, f)) {
+/* 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_v6[0]);
+ 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);
}
-
- exit(TRUE);
+#endif
+ return EXIT_SUCCESS;
}