diff options
author | ed <ed@FreeBSD.org> | 2009-12-09 20:05:37 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2009-12-09 20:05:37 +0000 |
commit | 29d5f23adb43ba91d4560776bd04e3bb3b0e3f6d (patch) | |
tree | 11d46eb193ac94fd28a9fe6593ce4cf3dc0533c4 /usr.sbin/lastlogin | |
parent | 5d2d64bcf74bfed182eb883cf4e9bc6381b2dafd (diff) | |
download | FreeBSD-src-29d5f23adb43ba91d4560776bd04e3bb3b0e3f6d.zip FreeBSD-src-29d5f23adb43ba91d4560776bd04e3bb3b0e3f6d.tar.gz |
Port lastlogin(1) to libulog.
Just use ulog_getutxuser() to obtain lastlog records or ulog_getutxent()
to browse through all of them.
Diffstat (limited to 'usr.sbin/lastlogin')
-rw-r--r-- | usr.sbin/lastlogin/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/lastlogin/lastlogin.c | 59 |
2 files changed, 21 insertions, 43 deletions
diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile index 017aadf..ab87f4b 100644 --- a/usr.sbin/lastlogin/Makefile +++ b/usr.sbin/lastlogin/Makefile @@ -3,6 +3,9 @@ PROG= lastlogin MAN= lastlogin.8 -WARNS?= 2 +DPADD= ${LIBULOG} +LDADD= -lulog + +WARNS?= 6 .include <bsd.prog.mk> diff --git a/usr.sbin/lastlogin/lastlogin.c b/usr.sbin/lastlogin/lastlogin.c index 21c82c3..3d3edfb 100644 --- a/usr.sbin/lastlogin/lastlogin.c +++ b/usr.sbin/lastlogin/lastlogin.c @@ -36,20 +36,16 @@ __RCSID("$FreeBSD$"); __RCSID("$NetBSD: lastlogin.c,v 1.4 1998/02/03 04:45:35 perry Exp $"); #endif -#include <sys/types.h> #include <err.h> #include <pwd.h> #include <stdio.h> #include <stdlib.h> #include <time.h> -#include <timeconv.h> -#include <utmp.h> +#include <ulog.h> #include <unistd.h> -static const char *logfile = _PATH_LASTLOG; - int main(int, char **); -static void output(struct passwd *, struct lastlog *); +static void output(struct ulog_utmpx *); static void usage(void); int @@ -58,72 +54,51 @@ main(argc, argv) char *argv[]; { int ch, i; - FILE *fp; - struct passwd *passwd; - struct lastlog last; + struct ulog_utmpx *u; while ((ch = getopt(argc, argv, "")) != -1) { usage(); } - fp = fopen(logfile, "r"); - if (fp == NULL) - err(1, "%s", logfile); + if (ulog_setutxfile(UTXF_LASTLOG, NULL) != 0) + errx(1, "failed to open lastlog database"); setpassent(1); /* Keep passwd file pointers open */ /* Process usernames given on the command line. */ if (argc > 1) { - long offset; for (i = 1; i < argc; ++i) { - if ((passwd = getpwnam(argv[i])) == NULL) { + if ((u = ulog_getutxuser(argv[i])) == NULL) { warnx("user '%s' not found", argv[i]); continue; } - /* Calculate the offset into the lastlog file. */ - offset = (long)(passwd->pw_uid * sizeof(last)); - if (fseek(fp, offset, SEEK_SET)) { - warn("fseek error"); - continue; - } - if (fread(&last, sizeof(last), 1, fp) != 1) { - warnx("fread error on '%s'", passwd->pw_name); - clearerr(fp); - continue; - } - output(passwd, &last); + output(u); } } /* Read all lastlog entries, looking for active ones */ else { - for (i = 0; fread(&last, sizeof(last), 1, fp) == 1; i++) { - if (last.ll_time == 0) + while ((u = ulog_getutxent()) != NULL) { + if (u->ut_type != USER_PROCESS) continue; - if ((passwd = getpwuid((uid_t)i)) != NULL) - output(passwd, &last); + output(u); } - if (ferror(fp)) - warnx("fread error"); } setpassent(0); /* Close passwd file pointers */ - fclose(fp); + ulog_endutxent(); exit(0); } /* Duplicate the output of last(1) */ static void -output(p, l) - struct passwd *p; - struct lastlog *l; +output(struct ulog_utmpx *u) { - time_t t = _int_to_time(l->ll_time); - printf("%-*.*s %-*.*s %-*.*s %s", - UT_NAMESIZE, UT_NAMESIZE, p->pw_name, - UT_LINESIZE, UT_LINESIZE, l->ll_line, - UT_HOSTSIZE, UT_HOSTSIZE, l->ll_host, - (l->ll_time) ? ctime(&t) : "Never logged in\n"); + time_t t = u->ut_tv.tv_sec; + + printf("%-16s %-8s %-16s %s", + u->ut_user, u->ut_line, u->ut_host, + (u->ut_type == USER_PROCESS) ? ctime(&t) : "Never logged in\n"); } static void |