jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-26 20:12:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

last(1): Complete libxo transition

Browse Source 
Reviewed by:	des
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D41424
This commit is contained in:
Yan-Hao Wang 2024-10-12 22:05:14 +08:00 committed by Li-Wen Hsu
parent c808132731
commit aaa302d17f
No known key found for this signature in database
GPG Key ID: 7377A4A02A2954DD
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
usr.bin/last/last.c
View File

@ -36,7 +36,6 @@
#include <sys/stat.h>
#include <capsicum_helpers.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
#include <langinfo.h>
@ -106,7 +105,7 @@ usage(void)
xo_error(
"usage: last [-swy] [-d [[CC]YY][MMDD]hhmm[.SS]] [-f file] [-h host]\n"
" [-n maxrec] [-t tty] [user ...]\n");
exit(1);
exit(EXIT_FAILURE);
}
int
@ -120,8 +119,7 @@ main(int argc, char *argv[])
argc = xo_parse_args(argc, argv);
if (argc < 0)
exit(1);
atexit(xo_finish_atexit);
exit(EXIT_FAILURE);
maxrec = -1;
snaptime = 0;
@ -138,8 +136,11 @@ main(int argc, char *argv[])
if (p == NULL)
p = strchr(argv[optind], ch);
maxrec = atol(p);
if (!maxrec)
exit(0);
if (!maxrec) {
if (xo_finish() < 0)
xo_err(EXIT_FAILURE, "stdout");
exit(EXIT_SUCCESS);
}
}
break;
case 'd':
@ -205,7 +206,9 @@ main(int argc, char *argv[])
}
}
wtmp();
exit(0);
if (xo_finish() < 0)
xo_err(EXIT_FAILURE, "stdout");
exit(EXIT_SUCCESS);
}
/*
@ -278,8 +281,11 @@ doentry(struct utmpx *bp)
* shutdown/reboot appears while we are tracking the
* active range
*/
if (snaptime && snapfound)
exit(0);
if (snaptime && snapfound) {
if (xo_finish() < 0)
xo_err(EXIT_FAILURE, "stdout");
exit(EXIT_SUCCESS);
}
/*
* don't print shutdown/reboot entries unless flagged for
*/
@ -340,8 +346,11 @@ printentry(struct utmpx *bp, struct idtab *tt)
time_t delta; /* time difference */
time_t t;
if (maxrec != -1 && !maxrec--)
exit(0);
if (maxrec != -1 && !maxrec--) {
if (xo_finish() < 0)
xo_err(EXIT_FAILURE, "stdout");
exit(EXIT_SUCCESS);
}
xo_open_instance("last");
t = bp->ut_tv.tv_sec;
tm = localtime(&t);