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

Use _ULOG_POSIX_NAMES here, to make eventual porting to <utmpx.h> easier.

Browse Source 
By the time we gain a real <utmpx.h>, it's just a matter of changing the
include at the top and -lulog from the Makefile.
This commit is contained in:
Ed Schouten 2009-12-05 19:54:37 +00:00
parent 42782e4717
commit cfe41e3b68
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@ static const char rcsid[] =
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define _ULOG_POSIX_NAMES
#include <ulog.h>
#include <unistd.h>
@ -66,7 +67,7 @@ main(int argc, char **argv)
int ncnt = 0;
int nmax = 0;
int cnt;
struct ulog_utmpx *ut;
struct utmpx *ut;
int ch;
while ((ch = getopt(argc, argv, "")) != -1)
@ -78,8 +79,8 @@ main(int argc, char **argv)
argc -= optind;
argv += optind;
ulog_setutxent();
while ((ut = ulog_getutxent()) != NULL) {
setutxent();
while ((ut = getutxent()) != NULL) {
if (ut->ut_type != USER_PROCESS)
continue;
if (ncnt >= nmax) {
@ -93,7 +94,7 @@ main(int argc, char **argv)
(void)strlcpy(names[ncnt], ut->ut_user, sizeof(*names));
++ncnt;
}
ulog_endutxent();
endutxent();
if (ncnt > 0) {
qsort(names, ncnt, sizeof(namebuf), scmp);
(void)printf("%s", names[0]);