Prepare for the inclusion of libposix1e into libc: retire the old

Makefile, add Makefile.inc needed for libc build; add
#include "namespace.h"/#include "un-namespace.h" pairs around the
includes of sys/acl.h and sys/capability.h, and an additional underscore
in front of the functions that will be overridden in libc_r.

Approved by:	rwatson
Obtained from:	TrustedBSD Project

29 files changed, 70 insertions, 12 deletions

diff --git a/lib/libc/posix1e/Makefile b/lib/libc/posix1e/Makefile.inc
index 1e2871f..fd4d8d1 100644
--- a/lib/libc/posix1e/Makefile
+++ b/lib/libc/posix1e/Makefile.inc
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 MAINTAINER=	rwatson@FreeBSD.org
-LIB=	posix1e
-SHLIB_MAJOR= 2 
-SHLIB_MINOR= 0
+
+.PATH: ${.CURDIR}/../libc/posix1e
+
 SRCS+=	acl_calc_mask.c			\
 	acl_copy.c			\
 	acl_delete.c			\
@@ -32,6 +32,8 @@ SRCS+=	acl_calc_mask.c			\
 	cap_set_proc.c			\
 	cap_text.c
 
+.if ${LIB} == "c"
+
 MAN=	acl.3				\
 	acl_add_perm.3			\
 	acl_calc_mask.3			\
@@ -79,4 +81,4 @@ MLINKS+=acl_delete.3 acl_delete_def_file.3	\
 	acl_valid.3 acl_valid_file_np.3		\
 	acl_valid.3 acl_valid_fd_np.3
 
-.include <bsd.lib.mk>
+.endif
diff --git a/lib/libc/posix1e/acl_calc_mask.c b/lib/libc/posix1e/acl_calc_mask.c
index ebacb02..d9d9322 100644
--- a/lib/libc/posix1e/acl_calc_mask.c
+++ b/lib/libc/posix1e/acl_calc_mask.c
@@ -27,7 +27,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 
 #include <errno.h>
 
diff --git a/lib/libc/posix1e/acl_copy.c b/lib/libc/posix1e/acl_copy.c
index 86a24cc..9725231 100644
--- a/lib/libc/posix1e/acl_copy.c
+++ b/lib/libc/posix1e/acl_copy.c
@@ -27,7 +27,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libc/posix1e/acl_delete.c b/lib/libc/posix1e/acl_delete.c
index 36d50af..2f5205d 100644
--- a/lib/libc/posix1e/acl_delete.c
+++ b/lib/libc/posix1e/acl_delete.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 #include <sys/errno.h>
 
 int
@@ -53,5 +55,5 @@ int
 acl_delete_fd_np(int filedes, acl_type_t type)
 {
 
-	return (__acl_delete_fd(filedes, type));
+	return (___acl_delete_fd(filedes, type));
 }
diff --git a/lib/libc/posix1e/acl_delete_entry.c b/lib/libc/posix1e/acl_delete_entry.c
index d1f25d2..e961ab2 100644
--- a/lib/libc/posix1e/acl_delete_entry.c
+++ b/lib/libc/posix1e/acl_delete_entry.c
@@ -29,7 +29,9 @@
 /* acl_delete_entry() - delete an ACL entry from an ACL */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 #include <errno.h>
 #include <string.h>
 
diff --git a/lib/libc/posix1e/acl_entry.c b/lib/libc/posix1e/acl_entry.c
index a8755e9..47d66f6 100644
--- a/lib/libc/posix1e/acl_entry.c
+++ b/lib/libc/posix1e/acl_entry.c
@@ -27,7 +27,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libc/posix1e/acl_free.c b/lib/libc/posix1e/acl_free.c
index ab73018..9dd9ee9 100644
--- a/lib/libc/posix1e/acl_free.c
+++ b/lib/libc/posix1e/acl_free.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 #include <sys/errno.h>
 #include <stdlib.h>
 
diff --git a/lib/libc/posix1e/acl_from_text.c b/lib/libc/posix1e/acl_from_text.c
index a772024..8b47338 100644
--- a/lib/libc/posix1e/acl_from_text.c
+++ b/lib/libc/posix1e/acl_from_text.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 #include <sys/errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/posix1e/acl_get.c b/lib/libc/posix1e/acl_get.c
index 00a1928..2d5ebff 100644
--- a/lib/libc/posix1e/acl_get.c
+++ b/lib/libc/posix1e/acl_get.c
@@ -35,7 +35,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 
 #include <errno.h>
 #include <stdlib.h>
@@ -72,7 +74,7 @@ acl_get_fd(int fd)
 		return (NULL);
 	}
 
-	error = __acl_get_fd(fd, ACL_TYPE_ACCESS, aclp);
+	error = ___acl_get_fd(fd, ACL_TYPE_ACCESS, aclp);
 	if (error) {
 		acl_free(aclp);
 		return (NULL);
@@ -92,7 +94,7 @@ acl_get_fd_np(int fd, acl_type_t type)
 		return (NULL);
 	}
 
-	error = __acl_get_fd(fd, type, aclp);
+	error = ___acl_get_fd(fd, type, aclp);
 	if (error) {
 		acl_free(aclp);
 		return (NULL);
diff --git a/lib/libc/posix1e/acl_init.c b/lib/libc/posix1e/acl_init.c
index 1963ed0..d6e8f05 100644
--- a/lib/libc/posix1e/acl_init.c
+++ b/lib/libc/posix1e/acl_init.c
@@ -31,7 +31,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/posix1e/acl_perm.c b/lib/libc/posix1e/acl_perm.c
index 12ab17a..cdd8e30 100644
--- a/lib/libc/posix1e/acl_perm.c
+++ b/lib/libc/posix1e/acl_perm.c
@@ -27,7 +27,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libc/posix1e/acl_set.c b/lib/libc/posix1e/acl_set.c
index 58be508..172e9db 100644
--- a/lib/libc/posix1e/acl_set.c
+++ b/lib/libc/posix1e/acl_set.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 
 #include <errno.h>
 #include <stdlib.h>
@@ -71,7 +73,7 @@ acl_set_fd(int fd, acl_t acl)
 		return(-1);
 	}
 
-	return (__acl_set_fd(fd, ACL_TYPE_ACCESS, acl));
+	return (___acl_set_fd(fd, ACL_TYPE_ACCESS, acl));
 }
 
 int
@@ -87,7 +89,7 @@ acl_set_fd_np(int fd, acl_t acl, acl_type_t type)
 		}
 	}
 
-	return (__acl_set_fd(fd, type, acl));
+	return (___acl_set_fd(fd, type, acl));
 }
 
 /*
diff --git a/lib/libc/posix1e/acl_size.c b/lib/libc/posix1e/acl_size.c
index 156b774..78ffff1 100644
--- a/lib/libc/posix1e/acl_size.c
+++ b/lib/libc/posix1e/acl_size.c
@@ -27,7 +27,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 
 #include <errno.h>
 
diff --git a/lib/libc/posix1e/acl_support.c b/lib/libc/posix1e/acl_support.c
index 6a9a141..128e1fc 100644
--- a/lib/libc/posix1e/acl_support.c
+++ b/lib/libc/posix1e/acl_support.c
@@ -31,7 +31,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 #include <errno.h>
 #include <grp.h>
 #include <pwd.h>
diff --git a/lib/libc/posix1e/acl_to_text.c b/lib/libc/posix1e/acl_to_text.c
index 70f8b07..20f2b9e 100644
--- a/lib/libc/posix1e/acl_to_text.c
+++ b/lib/libc/posix1e/acl_to_text.c
@@ -31,7 +31,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 #include <sys/errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/posix1e/acl_valid.c b/lib/libc/posix1e/acl_valid.c
index 8c7ca67..fe50889 100644
--- a/lib/libc/posix1e/acl_valid.c
+++ b/lib/libc/posix1e/acl_valid.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/acl.h>
+#include "un-namespace.h"
 #include <sys/errno.h>
 
 #include "acl_support.h"
@@ -93,5 +95,5 @@ acl_valid_fd_np(int fd, acl_type_t type, acl_t acl)
 		}
 	}
 
-	return (__acl_aclcheck_fd(fd, type, acl));
+	return (___acl_aclcheck_fd(fd, type, acl));
 }
diff --git a/lib/libc/posix1e/cap_clear.c b/lib/libc/posix1e/cap_clear.c
index eb6b39a..399886f 100644
--- a/lib/libc/posix1e/cap_clear.c
+++ b/lib/libc/posix1e/cap_clear.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/capability.h>
+#include "un-namespace.h"
 
 #include <string.h>
 
diff --git a/lib/libc/posix1e/cap_dup.c b/lib/libc/posix1e/cap_dup.c
index 7aacc81..50db981 100644
--- a/lib/libc/posix1e/cap_dup.c
+++ b/lib/libc/posix1e/cap_dup.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/capability.h>
+#include "un-namespace.h"
 
 #include <string.h>
 
diff --git a/lib/libc/posix1e/cap_free.c b/lib/libc/posix1e/cap_free.c
index 3c77992..20ec193 100644
--- a/lib/libc/posix1e/cap_free.c
+++ b/lib/libc/posix1e/cap_free.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/capability.h>
+#include "un-namespace.h"
 
 #include <stdlib.h>
 
diff --git a/lib/libc/posix1e/cap_get_fd.c b/lib/libc/posix1e/cap_get_fd.c
index 5b0197a..b8e98b9 100644
--- a/lib/libc/posix1e/cap_get_fd.c
+++ b/lib/libc/posix1e/cap_get_fd.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/capability.h>
+#include "un-namespace.h"
 #include <sys/errno.h>
 
 #include <stdlib.h>
@@ -45,7 +47,7 @@ cap_get_fd(int fd)
 	if (!cap)
 		return (NULL);
 
-	error = __cap_get_fd(fd, cap);
+	error = ___cap_get_fd(fd, cap);
 	if (error) {
 		errno = error;
 		cap_free(cap);
diff --git a/lib/libc/posix1e/cap_get_file.c b/lib/libc/posix1e/cap_get_file.c
index a74bc41..e453f01 100644
--- a/lib/libc/posix1e/cap_get_file.c
+++ b/lib/libc/posix1e/cap_get_file.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/capability.h>
+#include "un-namespace.h"
 #include <sys/errno.h>
 
 #include <stdlib.h>
diff --git a/lib/libc/posix1e/cap_get_flag.c b/lib/libc/posix1e/cap_get_flag.c
index 37595ee..2f0f221 100644
--- a/lib/libc/posix1e/cap_get_flag.c
+++ b/lib/libc/posix1e/cap_get_flag.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/capability.h>
+#include "un-namespace.h"
 #include <sys/errno.h>
 
 int
diff --git a/lib/libc/posix1e/cap_get_proc.c b/lib/libc/posix1e/cap_get_proc.c
index d2bf96b..5baa45a 100644
--- a/lib/libc/posix1e/cap_get_proc.c
+++ b/lib/libc/posix1e/cap_get_proc.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/capability.h>
+#include "un-namespace.h"
 #include <sys/errno.h>
 
 #include <stdlib.h>
diff --git a/lib/libc/posix1e/cap_init.c b/lib/libc/posix1e/cap_init.c
index 377c524..61c0d59 100644
--- a/lib/libc/posix1e/cap_init.c
+++ b/lib/libc/posix1e/cap_init.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/capability.h>
+#include "un-namespace.h"
 #include <sys/errno.h>
 
 #include <stdlib.h>
diff --git a/lib/libc/posix1e/cap_set_fd.c b/lib/libc/posix1e/cap_set_fd.c
index 70b7160..f6791b9 100644
--- a/lib/libc/posix1e/cap_set_fd.c
+++ b/lib/libc/posix1e/cap_set_fd.c
@@ -30,11 +30,13 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/capability.h>
+#include "un-namespace.h"
 
 int
 cap_set_fd(int fd, cap_t cap_p)
 {
 
-	return (__cap_set_fd(fd, cap_p));
+	return (___cap_set_fd(fd, cap_p));
 }
diff --git a/lib/libc/posix1e/cap_set_file.c b/lib/libc/posix1e/cap_set_file.c
index 4aa202f..d1e5de1 100644
--- a/lib/libc/posix1e/cap_set_file.c
+++ b/lib/libc/posix1e/cap_set_file.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/capability.h>
+#include "un-namespace.h"
 
 
 int
diff --git a/lib/libc/posix1e/cap_set_flag.c b/lib/libc/posix1e/cap_set_flag.c
index bf150e9..dc4244c 100644
--- a/lib/libc/posix1e/cap_set_flag.c
+++ b/lib/libc/posix1e/cap_set_flag.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/capability.h>
+#include "un-namespace.h"
 #include <sys/errno.h>
 
 int
diff --git a/lib/libc/posix1e/cap_set_proc.c b/lib/libc/posix1e/cap_set_proc.c
index 14fb44b..724add6 100644
--- a/lib/libc/posix1e/cap_set_proc.c
+++ b/lib/libc/posix1e/cap_set_proc.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/capability.h>
+#include "un-namespace.h"
 
 #include <sys/errno.h>
 
diff --git a/lib/libc/posix1e/cap_text.c b/lib/libc/posix1e/cap_text.c
index 367ff20..9b35c03 100644
--- a/lib/libc/posix1e/cap_text.c
+++ b/lib/libc/posix1e/cap_text.c
@@ -30,7 +30,9 @@
  */
 
 #include <sys/types.h>
+#include "namespace.h"
 #include <sys/capability.h>
+#include "un-namespace.h"
 #include <sys/errno.h>
 
 #include <stdio.h>