svn commit: r202098 - in user/ed/utmpx: bin/csh contrib/tcsh

Ed Schouten ed at FreeBSD.org
Mon Jan 11 18:35:59 UTC 2010


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


More information about the svn-src-user mailing list