Add a libutempter compatibility interface to libulog.

The ulog_login_pseudo(3) and ulog_logout_pseudo(3) interfaces provide a
functionality identical to what libutempter has to offer. Just transform
libutempter's calls into the before mentioned functions.

libutempter doesn't work with utmpx, so instead of fixing I thought the
easiest way would be to integrate this functionality. libutempter is
used by applications like xterm and the KDE libraries, so if I ever
change the underlying file format, these applications will keep working
automatically.

Also increase __FreeBSD_version to indicate the addition (as well as the
import of libulog).

1 files changed, 22 insertions, 4 deletions

diff --git a/lib/libulog/Makefile b/lib/libulog/Makefile
index 4c3ac93..c6cb510 100644
--- a/lib/libulog/Makefile
+++ b/lib/libulog/Makefile
@@ -1,12 +1,15 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	ulog
 SHLIB_MAJOR= 0
-INCS=	ulog.h
+INCS=	ulog.h utempter.h
 SRCS=	ulog.h ulog_getutxent.c ulog_internal.h ulog_login.c \
-	ulog_login_pseudo.c ulog_pututxline.c ulog_util.c
+	ulog_login_pseudo.c ulog_pututxline.c ulog_util.c utempter.c
 
-MAN=	ulog_getutxent.3 ulog_login.3 ulog_setutxfile.3
+MAN=	ulog_getutxent.3 ulog_login.3 ulog_setutxfile.3 \
+	utempter_add_record.3
 MLINKS+=ulog_getutxent.3 ulog_endutxent.3 \
 	ulog_getutxent.3 ulog_getutxline.3 \
 	ulog_getutxent.3 ulog_pututxline.3 \
@@ -14,7 +17,12 @@ MLINKS+=ulog_getutxent.3 ulog_endutxent.3 \
 	ulog_login.3 ulog_login_pseudo.3 \
 	ulog_login.3 ulog_logout.3 \
 	ulog_login.3 ulog_logout_pseudo.3 \
-	ulog_setutxfile.3 ulog_getutxuser.3
+	ulog_setutxfile.3 ulog_getutxuser.3 \
+	utempter_add_record.3 utempter_remove_added_record.3 \
+	utempter_add_record.3 utempter_remove_record.3 \
+	utempter_add_record.3 addToUtmp.3 \
+	utempter_remove_added_record.3 removeFromUtmp.3 \
+	utempter_remove_record.3 removeLineFromUtmp.3
 
 # Add links to <utmpx.h>-style functions.
 MLINKS+=ulog_endutxent.3 endutxent.3 \
@@ -28,4 +36,14 @@ WARNS?=	6
 VERSION_DEF= ${.CURDIR}/../libc/Versions.def
 SYMBOL_MAPS= ${.CURDIR}/Symbol.map
 
+.if ${MK_INSTALLLIB} != "no"
+SYMLINKS+=libulog.a ${LIBDIR}/libutempter.a
+.endif
+.if !defined(NO_PIC)
+SYMLINKS+=libulog.so ${LIBDIR}/libutempter.so
+.endif
+.if ${MK_PROFILE} != "no"
+SYMLINKS+=libulog_p.a ${LIBDIR}/libutempter_p.a
+.endif
+
 .include <bsd.lib.mk>