Date: Wed, 13 Jan 2010 18:09:54 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r202200 - in head/usr.bin: systat users wall who write Message-ID: <201001131809.o0DI9sCS082727@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed Date: Wed Jan 13 18:09:54 2010 New Revision: 202200 URL: http://svn.freebsd.org/changeset/base/202200 Log: 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. Modified: head/usr.bin/systat/Makefile head/usr.bin/systat/vmstat.c head/usr.bin/users/Makefile head/usr.bin/users/users.c head/usr.bin/wall/Makefile head/usr.bin/wall/wall.c head/usr.bin/who/Makefile head/usr.bin/who/who.c head/usr.bin/write/Makefile head/usr.bin/write/write.c Modified: head/usr.bin/systat/Makefile ============================================================================== --- head/usr.bin/systat/Makefile Wed Jan 13 18:09:21 2010 (r202199) +++ head/usr.bin/systat/Makefile Wed Jan 13 18:09:54 2010 (r202200) @@ -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> Modified: head/usr.bin/systat/vmstat.c ============================================================================== --- head/usr.bin/systat/vmstat.c Wed Jan 13 18:09:21 2010 (r202199) +++ head/usr.bin/systat/vmstat.c Wed Jan 13 18:09:54 2010 (r202200) @@ -65,9 +65,8 @@ static const char sccsid[] = "@(#)vmstat #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" Modified: head/usr.bin/users/Makefile ============================================================================== --- head/usr.bin/users/Makefile Wed Jan 13 18:09:21 2010 (r202199) +++ head/usr.bin/users/Makefile Wed Jan 13 18:09:54 2010 (r202200) @@ -3,7 +3,4 @@ PROG= users -DPADD= ${LIBULOG} -LDADD= -lulog - .include <bsd.prog.mk> Modified: head/usr.bin/users/users.c ============================================================================== --- head/usr.bin/users/users.c Wed Jan 13 18:09:21 2010 (r202199) +++ head/usr.bin/users/users.c Wed Jan 13 18:09:54 2010 (r202200) @@ -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]; Modified: head/usr.bin/wall/Makefile ============================================================================== --- head/usr.bin/wall/Makefile Wed Jan 13 18:09:21 2010 (r202199) +++ head/usr.bin/wall/Makefile Wed Jan 13 18:09:54 2010 (r202200) @@ -6,7 +6,4 @@ SRCS= ttymsg.c wall.c BINGRP= tty BINMODE=2555 -DPADD= ${LIBULOG} -LDADD= -lulog - .include <bsd.prog.mk> Modified: head/usr.bin/wall/wall.c ============================================================================== --- head/usr.bin/wall/wall.c Wed Jan 13 18:09:21 2010 (r202199) +++ head/usr.bin/wall/wall.c Wed Jan 13 18:09:54 2010 (r202200) @@ -64,9 +64,8 @@ static const char sccsid[] = "@(#)wall.c #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" Modified: head/usr.bin/who/Makefile ============================================================================== --- head/usr.bin/who/Makefile Wed Jan 13 18:09:21 2010 (r202199) +++ head/usr.bin/who/Makefile Wed Jan 13 18:09:54 2010 (r202200) @@ -3,7 +3,4 @@ PROG= who -DPADD= ${LIBULOG} -LDADD= -lulog - .include <bsd.prog.mk> Modified: head/usr.bin/who/who.c ============================================================================== --- head/usr.bin/who/who.c Wed Jan 13 18:09:21 2010 (r202199) +++ head/usr.bin/who/who.c Wed Jan 13 18:09:54 2010 (r202200) @@ -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); } Modified: head/usr.bin/write/Makefile ============================================================================== --- head/usr.bin/write/Makefile Wed Jan 13 18:09:21 2010 (r202199) +++ head/usr.bin/write/Makefile Wed Jan 13 18:09:54 2010 (r202200) @@ -5,7 +5,4 @@ PROG= write BINMODE=2555 BINGRP= tty -DPADD= ${LIBULOG} -LDADD= -lulog - .include <bsd.prog.mk> Modified: head/usr.bin/write/write.c ============================================================================== --- head/usr.bin/write/write.c Wed Jan 13 18:09:21 2010 (r202199) +++ head/usr.bin/write/write.c Wed Jan 13 18:09:54 2010 (r202200) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001131809.o0DI9sCS082727>