From 9549f742018da89a004f74f803ebac53c70a7af7 Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Sun, 22 Jan 2012 11:34:24 +0000 Subject: [PATCH] - Replace "wtmp" with "utx.log" because last(1) no longer reads wtmp. - A real filename is now shown in an output report when "-f file" is specified. - Add Xr lastlogin into last(1) manual page. Reviewed by: ed MFC after: 1 week --- usr.bin/last/last.1 | 1 + usr.bin/last/last.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1 index e4b21d4e4b4..4ac12bfe87c 100644 --- a/usr.bin/last/last.1 +++ b/usr.bin/last/last.1 @@ -198,6 +198,7 @@ login data base .El .Sh SEE ALSO .Xr lastcomm 1 , +.Xr lastlogin 8 , .Xr getutxent 3 , .Xr ac 8 .Sh HISTORY diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c index 3ac744ec6f9..e587def5fca 100644 --- a/usr.bin/last/last.c +++ b/usr.bin/last/last.c @@ -83,7 +83,7 @@ struct idtab { static const char *crmsg; /* cause of last reboot */ static time_t currentout; /* current logout value */ static long maxrec; /* records to display */ -static const char *file = NULL; /* wtmp file */ +static const char *file = NULL; /* utx.log file */ static int sflag = 0; /* show delta in seconds */ static int width = 5; /* show seconds in delta */ static int yflag; /* show year */ @@ -194,7 +194,7 @@ main(int argc, char *argv[]) /* * wtmp -- - * read through the wtmp file + * read through the utx.log file */ static void wtmp(void) @@ -229,13 +229,13 @@ wtmp(void) doentry(&buf[--amount]); tm = localtime(&t); - (void) strftime(ct, sizeof(ct), "\nwtmp begins %+\n", tm); - printf("%s", ct); + (void) strftime(ct, sizeof(ct), "%+", tm); + printf("\n%s begins %s\n", ((file == NULL) ? "utx.log" : file), ct); } /* * doentry -- - * process a single wtmp entry + * process a single utx.log entry */ static void doentry(struct utmpx *bp)