From owner-svn-src-user@FreeBSD.ORG Mon Jan 11 18:35:59 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2EC07106568D; Mon, 11 Jan 2010 18:35:59 +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 1DFA48FC16; Mon, 11 Jan 2010 18:35:59 +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 o0BIZxYF042014; Mon, 11 Jan 2010 18:35:59 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0BIZw2n042010; Mon, 11 Jan 2010 18:35:58 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201001111835.o0BIZw2n042010@svn.freebsd.org> From: Ed Schouten Date: Mon, 11 Jan 2010 18:35:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202098 - in user/ed/utmpx: bin/csh contrib/tcsh X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2010 18:35:59 -0000 Author: ed Date: Mon Jan 11 18:35:58 2010 New Revision: 202098 URL: http://svn.freebsd.org/changeset/base/202098 Log: Make utmpx work with csh without modifying anything in contrib/tcsh. Eventually we should get rid of UTMPX_FILE, because maybe in the very far future we have some kind of high-tech logging daemon -- who knows. For now, just set UTMPX_FILE to the file our implementation uses. Discussed with: mp Modified: user/ed/utmpx/bin/csh/config.h user/ed/utmpx/bin/csh/config_p.h user/ed/utmpx/contrib/tcsh/tc.who.c Modified: user/ed/utmpx/bin/csh/config.h ============================================================================== --- user/ed/utmpx/bin/csh/config.h Mon Jan 11 18:10:13 2010 (r202097) +++ user/ed/utmpx/bin/csh/config.h Mon Jan 11 18:35:58 2010 (r202098) @@ -54,7 +54,7 @@ #define HAVE_GETPWENT 1 /* Define to 1 if you have the `getutent' function. */ -/* #undef HAVE_GETUTENT */ +#define HAVE_GETUTENT 1 /* Define if you have the iconv() function. */ /* #undef HAVE_ICONV */ Modified: user/ed/utmpx/bin/csh/config_p.h ============================================================================== --- user/ed/utmpx/bin/csh/config_p.h Mon Jan 11 18:10:13 2010 (r202097) +++ user/ed/utmpx/bin/csh/config_p.h Mon Jan 11 18:35:58 2010 (r202098) @@ -110,4 +110,6 @@ # define NLS_CATALOGS #endif +#define UTMPX_FILE "/var/run/utx.active" + #endif /* _h_config */ Modified: user/ed/utmpx/contrib/tcsh/tc.who.c ============================================================================== --- user/ed/utmpx/contrib/tcsh/tc.who.c Mon Jan 11 18:10:13 2010 (r202097) +++ user/ed/utmpx/contrib/tcsh/tc.who.c Mon Jan 11 18:35:58 2010 (r202098) @@ -55,8 +55,6 @@ RCSID("$tcsh: tc.who.c,v 3.51 2006/03/03 # define TCSH_PATH_UTMP _PATH_UTMPX # elif defined(UTMPX_FILE) # define TCSH_PATH_UTMP UTMPX_FILE -# else -# define TCSH_PATH_UTMP "/nonexistent" # endif /* __UTMPX_FILE && !UTMPX_FILE */ # ifdef TCSH_PATH_UTMP # define utmp utmpx