d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port users(1) to libulog.

Browse Source 
Instead of digging through the utmp database by hand, use proper API
calls to do so.  Instead of parsing entries with a non-empty ut_user, we
now look at LOGIN_PROCESS entries.
This commit is contained in:
Ed Schouten 2009-12-03 16:42:18 +00:00
parent fab0a3c997
commit 42b525af6e
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/users/Makefile
View File

@ -3,4 +3,7 @@
PROG= users
DPADD= ${LIBULOG}
LDADD= -lulog
.include <bsd.prog.mk>

46
usr.bin/users/users.c
View File

@ -45,15 +45,16 @@ static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
#include <sys/types.h>
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ulog.h>
#include <unistd.h>
#include <utmp.h>
typedef char namebuf[UT_NAMESIZE];
typedef char namebuf[MAXLOGNAME];
int scmp(const void *, const void *);
static void usage(void);
@ -65,7 +66,7 @@ main(int argc, char **argv)
int ncnt = 0;
int nmax = 0;
int cnt;
struct utmp utmp;
struct ulog_utmpx *ut;
int ch;
while ((ch = getopt(argc, argv, "")) != -1)
@ -77,28 +78,28 @@ main(int argc, char **argv)
argc -= optind;
argv += optind;
if (!freopen(_PATH_UTMP, "r", stdin))
errx(1, "can't open %s", _PATH_UTMP);
while (fread((char *)&utmp, sizeof(utmp), 1, stdin) == 1) {
if (*utmp.ut_name) {
if (ncnt >= nmax) {
nmax += 32;
names = realloc(names, sizeof (*names) * nmax);
if (!names) {
errx(1, "realloc");
/* NOTREACHED */
}
ulog_setutxent();
while ((ut = ulog_getutxent()) != NULL) {
if (ut->ut_type != LOGIN_PROCESS)
continue;
if (ncnt >= nmax) {
nmax += 32;
names = realloc(names, sizeof(*names) * nmax);
if (!names) {
errx(1, "realloc");
/* NOTREACHED */
}
(void)strncpy(names[ncnt], utmp.ut_name, UT_NAMESIZE);
++ncnt;
}
(void)strlcpy(names[ncnt], ut->ut_user, sizeof(*names));
++ncnt;
}
if (ncnt) {
qsort(names, ncnt, UT_NAMESIZE, scmp);
(void)printf("%.*s", UT_NAMESIZE, names[0]);
ulog_endutxent();
if (ncnt > 0) {
qsort(names, ncnt, sizeof(namebuf), scmp);
(void)printf("%s", names[0]);
for (cnt = 1; cnt < ncnt; ++cnt)
if (strncmp(names[cnt], names[cnt - 1], UT_NAMESIZE))
(void)printf(" %.*s", UT_NAMESIZE, names[cnt]);
if (strcmp(names[cnt], names[cnt - 1]) != 0)
(void)printf(" %s", names[cnt]);
(void)printf("\n");
}
exit(0);
@ -114,5 +115,6 @@ usage(void)
int
scmp(const void *p, const void *q)
{
return(strncmp(p, q, UT_NAMESIZE));
return (strcmp(p, q));
}