From owner-svn-src-head@FreeBSD.ORG Wed Jan 13 17:50:58 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69F6C106568D; Wed, 13 Jan 2010 17:50:58 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 595428FC13; Wed, 13 Jan 2010 17:50:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DHowil078172; Wed, 13 Jan 2010 17:50:58 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0DHowEf078165; Wed, 13 Jan 2010 17:50:58 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201001131750.o0DHowEf078165@svn.freebsd.org> From: Ed Schouten Date: Wed, 13 Jan 2010 17:50:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202191 - head/usr.bin/finger X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 17:50:58 -0000 Author: ed Date: Wed Jan 13 17:50:58 2010 New Revision: 202191 URL: http://svn.freebsd.org/changeset/base/202191 Log: Migrate finger(1) towards utmpx. It was already ported to use libulog, which makes it simpler now. Be sure to catch the error returned by setutxdb(). Otherwise it may perform a lookup on the utx.active database. Modified: head/usr.bin/finger/Makefile head/usr.bin/finger/finger.c head/usr.bin/finger/lprint.c head/usr.bin/finger/net.c head/usr.bin/finger/sprint.c head/usr.bin/finger/util.c Modified: head/usr.bin/finger/Makefile ============================================================================== --- head/usr.bin/finger/Makefile Wed Jan 13 17:49:35 2010 (r202190) +++ head/usr.bin/finger/Makefile Wed Jan 13 17:50:58 2010 (r202191) @@ -7,7 +7,4 @@ MAN= finger.1 finger.conf.5 WARNS?= 2 -DPADD= ${LIBULOG} -LDADD= -lulog - .include Modified: head/usr.bin/finger/finger.c ============================================================================== --- head/usr.bin/finger/finger.c Wed Jan 13 17:49:35 2010 (r202190) +++ head/usr.bin/finger/finger.c Wed Jan 13 17:50:58 2010 (r202191) @@ -82,9 +82,8 @@ __FBSDID("$FreeBSD$"); #include #include #include -#define _ULOG_POSIX_NAMES -#include #include +#include #include #include "finger.h" Modified: head/usr.bin/finger/lprint.c ============================================================================== --- head/usr.bin/finger/lprint.c Wed Jan 13 17:49:35 2010 (r202190) +++ head/usr.bin/finger/lprint.c Wed Jan 13 17:50:58 2010 (r202191) @@ -56,9 +56,8 @@ __FBSDID("$FreeBSD$"); #include #include #include -#define _ULOG_POSIX_NAMES -#include #include +#include #include "finger.h" #include "pathnames.h" Modified: head/usr.bin/finger/net.c ============================================================================== --- head/usr.bin/finger/net.c Wed Jan 13 17:49:35 2010 (r202190) +++ head/usr.bin/finger/net.c Wed Jan 13 17:50:58 2010 (r202191) @@ -54,9 +54,8 @@ __FBSDID("$FreeBSD$"); #include #include #include -#define _ULOG_POSIX_NAMES -#include #include +#include #include "finger.h" static void cleanup(int sig); Modified: head/usr.bin/finger/sprint.c ============================================================================== --- head/usr.bin/finger/sprint.c Wed Jan 13 17:49:35 2010 (r202190) +++ head/usr.bin/finger/sprint.c Wed Jan 13 17:50:58 2010 (r202191) @@ -53,8 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#define _ULOG_POSIX_NAMES -#include +#include #include "finger.h" static void stimeprint(WHERE *); Modified: head/usr.bin/finger/util.c ============================================================================== --- head/usr.bin/finger/util.c Wed Jan 13 17:49:35 2010 (r202190) +++ head/usr.bin/finger/util.c Wed Jan 13 17:50:58 2010 (r202191) @@ -56,9 +56,8 @@ __FBSDID("$FreeBSD$"); #include #include #include -#define _ULOG_POSIX_NAMES -#include #include +#include #include "finger.h" #include "pathnames.h" @@ -110,11 +109,11 @@ void enter_lastlog(PERSON *pn) { WHERE *w; - struct ulog_utmpx *ut; + struct utmpx *ut = NULL; char doit = 0; - ulog_setutxfile(UTXI_USER, NULL); - ut = ulog_getutxuser(pn->name); + if (setutxdb(UTXDB_LASTLOGIN, NULL) == 0) + ut = getutxuser(pn->name); if ((w = pn->whead) == NULL) doit = 1; else if (ut != NULL && ut->ut_type == USER_PROCESS) { @@ -140,7 +139,7 @@ enter_lastlog(PERSON *pn) strcpy(w->host, ut->ut_host); w->loginat = ut->ut_tv.tv_sec; } - ulog_endutxent(); + endutxent(); } void