Perform all trivial ports to utmpx for usr.bin/.
They were already converted to use libulog, so it's easy to convert them to utmpx.
This commit is contained in:
parent
7aa5833636
commit
a618bd1a15
@ -16,7 +16,7 @@ CFLAGS+= -DINET6
|
||||
|
||||
WARNS?= 0
|
||||
|
||||
DPADD= ${LIBCURSES} ${LIBM} ${LIBDEVSTAT} ${LIBKVM} ${LIBULOG}
|
||||
LDADD= -lcursesw -lm -ldevstat -lkvm -lulog
|
||||
DPADD= ${LIBCURSES} ${LIBM} ${LIBDEVSTAT} ${LIBKVM}
|
||||
LDADD= -lcursesw -lm -ldevstat -lkvm
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -65,9 +65,8 @@ static const char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94";
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#define _ULOG_POSIX_NAMES
|
||||
#include <ulog.h>
|
||||
#include <unistd.h>
|
||||
#include <utmpx.h>
|
||||
#include <devstat.h>
|
||||
#include "systat.h"
|
||||
#include "extern.h"
|
||||
|
@ -3,7 +3,4 @@
|
||||
|
||||
PROG= users
|
||||
|
||||
DPADD= ${LIBULOG}
|
||||
LDADD= -lulog
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -51,9 +51,8 @@ static const char rcsid[] =
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#define _ULOG_POSIX_NAMES
|
||||
#include <ulog.h>
|
||||
#include <unistd.h>
|
||||
#include <utmpx.h>
|
||||
|
||||
typedef char namebuf[MAXLOGNAME];
|
||||
|
||||
|
@ -6,7 +6,4 @@ SRCS= ttymsg.c wall.c
|
||||
BINGRP= tty
|
||||
BINMODE=2555
|
||||
|
||||
DPADD= ${LIBULOG}
|
||||
LDADD= -lulog
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -64,9 +64,8 @@ static const char sccsid[] = "@(#)wall.c 8.2 (Berkeley) 11/16/93";
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#define _ULOG_POSIX_NAMES
|
||||
#include <ulog.h>
|
||||
#include <unistd.h>
|
||||
#include <utmpx.h>
|
||||
|
||||
#include "ttymsg.h"
|
||||
|
||||
|
@ -3,7 +3,4 @@
|
||||
|
||||
PROG= who
|
||||
|
||||
DPADD= ${LIBULOG}
|
||||
LDADD= -lulog
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -44,9 +44,8 @@ __FBSDID("$FreeBSD$");
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <timeconv.h>
|
||||
#define _ULOG_POSIX_NAMES
|
||||
#include <ulog.h>
|
||||
#include <unistd.h>
|
||||
#include <utmpx.h>
|
||||
|
||||
static void heading(void);
|
||||
static void process_utmp(void);
|
||||
@ -109,7 +108,7 @@ main(int argc, char *argv[])
|
||||
usage();
|
||||
|
||||
if (*argv != NULL) {
|
||||
if (ulog_setutxfile(UTXI_TTY, *argv) != 0)
|
||||
if (setutxdb(UTXDB_ACTIVE, *argv) != 0)
|
||||
err(1, "%s", *argv);
|
||||
}
|
||||
|
||||
|
@ -5,7 +5,4 @@ PROG= write
|
||||
BINMODE=2555
|
||||
BINGRP= tty
|
||||
|
||||
DPADD= ${LIBULOG}
|
||||
LDADD= -lulog
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -62,9 +62,8 @@ __FBSDID("$FreeBSD$");
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#define _ULOG_POSIX_NAMES
|
||||
#include <ulog.h>
|
||||
#include <unistd.h>
|
||||
#include <utmpx.h>
|
||||
|
||||
void done(int);
|
||||
void do_write(char *, char *, uid_t);
|
||||
|
Loading…
Reference in New Issue
Block a user