summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2000-01-19 06:13:59 +0000
committerrwatson <rwatson@FreeBSD.org>2000-01-19 06:13:59 +0000
commitbfcdbb750811389b1a6daf4c2fd36f4648abd3c6 (patch)
tree6d41d209d7772ccb2423ce46aacfe7a6a2e3bc64 /lib
parent81ac67ad74e0879cc0eb86f9abc74aca905c027b (diff)
downloadFreeBSD-src-bfcdbb750811389b1a6daf4c2fd36f4648abd3c6.zip
FreeBSD-src-bfcdbb750811389b1a6daf4c2fd36f4648abd3c6.tar.gz
Fix bde'isms in acl/extattr syscall interface, renaming syscalls to
prettier (?) names, adding some const's around here, et al. This is commit 4 out of 3, updating the userland library to reflect kernel interface changes. Reviewed by: bde
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/posix1e/acl_delete.c8
-rw-r--r--lib/libc/posix1e/acl_get.c8
-rw-r--r--lib/libc/posix1e/acl_init.c2
-rw-r--r--lib/libc/posix1e/acl_set.c4
-rw-r--r--lib/libc/posix1e/acl_support.c2
-rw-r--r--lib/libc/posix1e/acl_valid.c4
-rw-r--r--lib/libposix1e/acl_delete.c8
-rw-r--r--lib/libposix1e/acl_get.c8
-rw-r--r--lib/libposix1e/acl_init.c2
-rw-r--r--lib/libposix1e/acl_set.c4
-rw-r--r--lib/libposix1e/acl_support.c2
-rw-r--r--lib/libposix1e/acl_valid.c4
12 files changed, 28 insertions, 28 deletions
diff --git a/lib/libc/posix1e/acl_delete.c b/lib/libc/posix1e/acl_delete.c
index 537a55e..c3aa268 100644
--- a/lib/libc/posix1e/acl_delete.c
+++ b/lib/libc/posix1e/acl_delete.c
@@ -37,7 +37,7 @@ int
acl_delete_def_fd(int filedes)
{
- return (acl_syscall_delete_fd(filedes, ACL_TYPE_DEFAULT));
+ return (__acl_delete_fd(filedes, ACL_TYPE_DEFAULT));
}
@@ -45,7 +45,7 @@ int
acl_delete_def_file(const char *path_p)
{
- return (acl_syscall_delete_file(path_p, ACL_TYPE_DEFAULT));
+ return (__acl_delete_file(path_p, ACL_TYPE_DEFAULT));
}
@@ -53,7 +53,7 @@ int
acl_delete_file(const char *path_p, acl_type_t type)
{
- return (acl_syscall_delete_file(path_p, type));
+ return (__acl_delete_file(path_p, type));
}
@@ -61,5 +61,5 @@ int
acl_delete_fd(int filedes, acl_type_t type)
{
- return (acl_syscall_delete_fd(filedes, type));
+ return (__acl_delete_fd(filedes, type));
}
diff --git a/lib/libc/posix1e/acl_get.c b/lib/libc/posix1e/acl_get.c
index 3871229..1293f0b 100644
--- a/lib/libc/posix1e/acl_get.c
+++ b/lib/libc/posix1e/acl_get.c
@@ -40,12 +40,12 @@ acl_get_file(const char *path_p, acl_type_t type)
struct acl *aclp;
int error;
- aclp = acl_init(MAX_ACL_ENTRIES);
+ aclp = acl_init(ACL_MAX_ENTRIES);
if (!aclp) {
return (0);
}
- error = acl_syscall_get_file(path_p, type, aclp);
+ error = __acl_get_file(path_p, type, aclp);
if (error) {
acl_free(aclp);
return (0);
@@ -61,12 +61,12 @@ acl_get_fd(int fd, acl_type_t type)
struct acl *aclp;
int error;
- aclp = acl_init(MAX_ACL_ENTRIES);
+ aclp = acl_init(ACL_MAX_ENTRIES);
if (!aclp) {
return (0);
}
- error = acl_syscall_get_fd(fd, type, aclp);
+ error = __acl_get_fd(fd, type, aclp);
if (error) {
acl_free(aclp);
return (0);
diff --git a/lib/libc/posix1e/acl_init.c b/lib/libc/posix1e/acl_init.c
index 11308ed..a082ea8 100644
--- a/lib/libc/posix1e/acl_init.c
+++ b/lib/libc/posix1e/acl_init.c
@@ -40,7 +40,7 @@ acl_init(int count)
{
struct acl *acl;
- if (count > MAX_ACL_ENTRIES) {
+ if (count > ACL_MAX_ENTRIES) {
errno = ENOMEM;
return (0);
}
diff --git a/lib/libc/posix1e/acl_set.c b/lib/libc/posix1e/acl_set.c
index 6a04328..1873422 100644
--- a/lib/libc/posix1e/acl_set.c
+++ b/lib/libc/posix1e/acl_set.c
@@ -54,7 +54,7 @@ acl_set_file(const char *path_p, acl_type_t type, acl_t acl)
}
}
- return (acl_syscall_set_file(path_p, type, acl));
+ return (__acl_set_file(path_p, type, acl));
}
@@ -71,5 +71,5 @@ acl_set_fd(int fd, acl_t acl, acl_type_t type)
}
}
- return (acl_syscall_set_fd(fd, type, acl));
+ return (__acl_set_fd(fd, type, acl));
}
diff --git a/lib/libc/posix1e/acl_support.c b/lib/libc/posix1e/acl_support.c
index 22b1710..9f9ae26 100644
--- a/lib/libc/posix1e/acl_support.c
+++ b/lib/libc/posix1e/acl_support.c
@@ -429,7 +429,7 @@ acl_add_entry(acl_t acl, acl_tag_t tag, uid_t id, acl_perm_t perm)
{
struct acl_entry *e;
- if (acl->acl_cnt >= MAX_ACL_ENTRIES) {
+ if (acl->acl_cnt >= ACL_MAX_ENTRIES) {
errno = ENOMEM;
return (-1);
}
diff --git a/lib/libc/posix1e/acl_valid.c b/lib/libc/posix1e/acl_valid.c
index 683525e..602d4d5 100644
--- a/lib/libc/posix1e/acl_valid.c
+++ b/lib/libc/posix1e/acl_valid.c
@@ -77,7 +77,7 @@ acl_valid_file(const char *pathp, acl_type_t type, acl_t acl)
}
}
- return (acl_syscall_aclcheck_file(pathp, type, acl));
+ return (__acl_aclcheck_file(pathp, type, acl));
}
@@ -94,5 +94,5 @@ acl_valid_fd(int fd, acl_type_t type, acl_t acl)
}
}
- return (acl_syscall_aclcheck_fd(fd, type, acl));
+ return (__acl_aclcheck_fd(fd, type, acl));
}
diff --git a/lib/libposix1e/acl_delete.c b/lib/libposix1e/acl_delete.c
index 537a55e..c3aa268 100644
--- a/lib/libposix1e/acl_delete.c
+++ b/lib/libposix1e/acl_delete.c
@@ -37,7 +37,7 @@ int
acl_delete_def_fd(int filedes)
{
- return (acl_syscall_delete_fd(filedes, ACL_TYPE_DEFAULT));
+ return (__acl_delete_fd(filedes, ACL_TYPE_DEFAULT));
}
@@ -45,7 +45,7 @@ int
acl_delete_def_file(const char *path_p)
{
- return (acl_syscall_delete_file(path_p, ACL_TYPE_DEFAULT));
+ return (__acl_delete_file(path_p, ACL_TYPE_DEFAULT));
}
@@ -53,7 +53,7 @@ int
acl_delete_file(const char *path_p, acl_type_t type)
{
- return (acl_syscall_delete_file(path_p, type));
+ return (__acl_delete_file(path_p, type));
}
@@ -61,5 +61,5 @@ int
acl_delete_fd(int filedes, acl_type_t type)
{
- return (acl_syscall_delete_fd(filedes, type));
+ return (__acl_delete_fd(filedes, type));
}
diff --git a/lib/libposix1e/acl_get.c b/lib/libposix1e/acl_get.c
index 3871229..1293f0b 100644
--- a/lib/libposix1e/acl_get.c
+++ b/lib/libposix1e/acl_get.c
@@ -40,12 +40,12 @@ acl_get_file(const char *path_p, acl_type_t type)
struct acl *aclp;
int error;
- aclp = acl_init(MAX_ACL_ENTRIES);
+ aclp = acl_init(ACL_MAX_ENTRIES);
if (!aclp) {
return (0);
}
- error = acl_syscall_get_file(path_p, type, aclp);
+ error = __acl_get_file(path_p, type, aclp);
if (error) {
acl_free(aclp);
return (0);
@@ -61,12 +61,12 @@ acl_get_fd(int fd, acl_type_t type)
struct acl *aclp;
int error;
- aclp = acl_init(MAX_ACL_ENTRIES);
+ aclp = acl_init(ACL_MAX_ENTRIES);
if (!aclp) {
return (0);
}
- error = acl_syscall_get_fd(fd, type, aclp);
+ error = __acl_get_fd(fd, type, aclp);
if (error) {
acl_free(aclp);
return (0);
diff --git a/lib/libposix1e/acl_init.c b/lib/libposix1e/acl_init.c
index 11308ed..a082ea8 100644
--- a/lib/libposix1e/acl_init.c
+++ b/lib/libposix1e/acl_init.c
@@ -40,7 +40,7 @@ acl_init(int count)
{
struct acl *acl;
- if (count > MAX_ACL_ENTRIES) {
+ if (count > ACL_MAX_ENTRIES) {
errno = ENOMEM;
return (0);
}
diff --git a/lib/libposix1e/acl_set.c b/lib/libposix1e/acl_set.c
index 6a04328..1873422 100644
--- a/lib/libposix1e/acl_set.c
+++ b/lib/libposix1e/acl_set.c
@@ -54,7 +54,7 @@ acl_set_file(const char *path_p, acl_type_t type, acl_t acl)
}
}
- return (acl_syscall_set_file(path_p, type, acl));
+ return (__acl_set_file(path_p, type, acl));
}
@@ -71,5 +71,5 @@ acl_set_fd(int fd, acl_t acl, acl_type_t type)
}
}
- return (acl_syscall_set_fd(fd, type, acl));
+ return (__acl_set_fd(fd, type, acl));
}
diff --git a/lib/libposix1e/acl_support.c b/lib/libposix1e/acl_support.c
index 22b1710..9f9ae26 100644
--- a/lib/libposix1e/acl_support.c
+++ b/lib/libposix1e/acl_support.c
@@ -429,7 +429,7 @@ acl_add_entry(acl_t acl, acl_tag_t tag, uid_t id, acl_perm_t perm)
{
struct acl_entry *e;
- if (acl->acl_cnt >= MAX_ACL_ENTRIES) {
+ if (acl->acl_cnt >= ACL_MAX_ENTRIES) {
errno = ENOMEM;
return (-1);
}
diff --git a/lib/libposix1e/acl_valid.c b/lib/libposix1e/acl_valid.c
index 683525e..602d4d5 100644
--- a/lib/libposix1e/acl_valid.c
+++ b/lib/libposix1e/acl_valid.c
@@ -77,7 +77,7 @@ acl_valid_file(const char *pathp, acl_type_t type, acl_t acl)
}
}
- return (acl_syscall_aclcheck_file(pathp, type, acl));
+ return (__acl_aclcheck_file(pathp, type, acl));
}
@@ -94,5 +94,5 @@ acl_valid_fd(int fd, acl_type_t type, acl_t acl)
}
}
- return (acl_syscall_aclcheck_fd(fd, type, acl));
+ return (__acl_aclcheck_fd(fd, type, acl));
}
OpenPOWER on IntegriCloud