svn commit: r336779 - in head/lib: libc/gen libutil

[Ian Lepore]

Author: ian
Date: Fri Jul 27 19:47:42 2018
New Revision: 336779
URL: https://svnweb.freebsd.org/changeset/base/336779

Log:
  Stop exporting __pw_scan and __pw_initpwd as freebsd-private libc functions
  for use in libutil, and instead compile the small amount of common code
  directly into libutil with a .PATH reachover.
  
  Discussed with: kib@

Modified:
  head/lib/libc/gen/Symbol.map
  head/lib/libutil/Makefile

Modified: head/lib/libc/gen/Symbol.map
==============================================================================
--- head/lib/libc/gen/Symbol.map	Fri Jul 27 19:31:58 2018	(r336778)
+++ head/lib/libc/gen/Symbol.map	Fri Jul 27 19:47:42 2018	(r336779)
@@ -510,8 +510,6 @@ FBSDprivate_1.0 {
 	__opendir2;
 	__pause;
 	_pause;
-	__pw_initpwd;	/* Used by (at least) libutil */
-	__pw_scan;	/* Used by (at least) libutil */
 	__raise;
 	_raise;
 	__sleep;

Modified: head/lib/libutil/Makefile
==============================================================================
--- head/lib/libutil/Makefile	Fri Jul 27 19:31:58 2018	(r336778)
+++ head/lib/libutil/Makefile	Fri Jul 27 19:47:42 2018	(r336779)
@@ -6,6 +6,8 @@ SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
+.PATH: ${SRCTOP}/lib/libc/gen # for pw_scan.c
+
 LIB=	util
 SHLIB_MAJOR= 9
 
@@ -15,8 +17,8 @@ SRCS=	_secure_path.c auth.c expand_number.c flopen.c f
 	kinfo_getvmobject.c kld.c \
 	login_auth.c login_cap.c \
 	login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \
-	pidfile.c property.c pty.c pw_util.c quotafile.c realhostname.c \
-	stub.c trimdomain.c uucplock.c
+	pidfile.c property.c pty.c pw_scan.c pw_util.c quotafile.c \
+	realhostname.c stub.c trimdomain.c uucplock.c
 INCS=	libutil.h login_cap.h
 
 CFLAGS+= -DNO__SCCSID