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

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

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>
 

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>

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));
 }

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>
 

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>

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>
 

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>

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);

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>

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>

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));
 }
 
 /*

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>
 

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>

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>

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));
 }

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>
 

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>
 

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>
 

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);

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>

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

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>

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>

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));
 }

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

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

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>
 

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>