diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2011-04-04 17:18:38 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@linbit.com> | 2011-04-04 18:42:19 +0200 |
| commit | ad4ca5aaee96e98b2e8e8a4351fa5e6c58d65216 (patch) | |
| tree | 4a90e2e2872e52ddf425711f89072dc0495b93a9 | |
| parent | 6bf5e24d48077db58b389e90558100fc121b8134 (diff) | |
| download | acl-ad4ca5aaee96e98b2e8e8a4351fa5e6c58d65216.tar.gz | |
Minor fixes to the previous commit
* Assign the new libacl version ACL_1.2 to acl_extended_file_nofollow
so that package managers will end up with the appropriate
dependencies.
* Add a manpage entry for acl_extended_file_nofollow which sources
("links to") the acl_extended_file manpage.
* Remove the prototype for getxattr/lgetxattr.
* Whitespace cleanups.
| -rw-r--r-- | exports | 7 | ||||
| -rw-r--r-- | libacl/__acl_extended_file.c | 7 | ||||
| -rw-r--r-- | libacl/__acl_extended_file.h | 7 | ||||
| -rw-r--r-- | libacl/acl_extended_file_nofollow.c | 3 | ||||
| -rw-r--r-- | man/man3/acl_extended_file.3 | 2 | ||||
| -rw-r--r-- | man/man3/acl_extended_file_nofollow.3 | 1 |
6 files changed, 16 insertions, 11 deletions
@@ -82,5 +82,10 @@ ACL_1.1 { # Linux specific extensions perm_copy_fd; perm_copy_file; - acl_extended_file_nofollow; } ACL_1.0; + +ACL_1.2 { + global: + # Linux specific extensions + acl_extended_file_nofollow; +} ACL_1.1; diff --git a/libacl/__acl_extended_file.c b/libacl/__acl_extended_file.c index 629afe9..3e45abd 100644 --- a/libacl/__acl_extended_file.c +++ b/libacl/__acl_extended_file.c @@ -1,5 +1,5 @@ /* - File: acl_extended_file.c + File: __acl_extended_file.c Copyright (C) 2000, 2011 Andreas Gruenbacher, <a.gruenbacher@bestbits.at> @@ -29,7 +29,9 @@ int -__acl_extended_file(const char *path_p, getxattr_t fun) +__acl_extended_file(const char *path_p, + ssize_t (*fun)(const char *, const char *, + void *, size_t)) { int base_size = sizeof(acl_ea_header) + 3 * sizeof(acl_ea_entry); int retval; @@ -46,4 +48,3 @@ __acl_extended_file(const char *path_p, getxattr_t fun) return 1; return 0; } - diff --git a/libacl/__acl_extended_file.h b/libacl/__acl_extended_file.h index f8881a1..0b0da9e 100644 --- a/libacl/__acl_extended_file.h +++ b/libacl/__acl_extended_file.h @@ -1,4 +1,3 @@ -typedef ssize_t (*getxattr_t)(const char *, const char *, void *value, - size_t size); - -int __acl_extended_file(const char *path_p, getxattr_t fun); +int __acl_extended_file(const char *path_p, + ssize_t (*)(const char *, const char *, + void *, size_t)); diff --git a/libacl/acl_extended_file_nofollow.c b/libacl/acl_extended_file_nofollow.c index 8f4711f..c253e4d 100644 --- a/libacl/acl_extended_file_nofollow.c +++ b/libacl/acl_extended_file_nofollow.c @@ -1,5 +1,5 @@ /* - File: acl_extended_file.c + File: acl_extended_file_nofollow.c Copyright (C) 2011 Andreas Gruenbacher, <a.gruenbacher@bestbits.at> @@ -31,4 +31,3 @@ acl_extended_file_nofollow(const char *path_p) { return __acl_extended_file(path_p, lgetxattr); } - diff --git a/man/man3/acl_extended_file.3 b/man/man3/acl_extended_file.3 index 1f04331..fdeef86 100644 --- a/man/man3/acl_extended_file.3 +++ b/man/man3/acl_extended_file.3 @@ -65,7 +65,7 @@ system call can be used to check whether a given type of access to a file object would be granted. .Pp .Fn acl_extended_file_nofollow -is identical to +is identical to .Fn acl_extended_file , except in the case of a symbolic link, where the link itself is interrogated, not the file that it refers to. Since symbolic links have no ACL themselves, diff --git a/man/man3/acl_extended_file_nofollow.3 b/man/man3/acl_extended_file_nofollow.3 new file mode 100644 index 0000000..44fc24f --- /dev/null +++ b/man/man3/acl_extended_file_nofollow.3 @@ -0,0 +1 @@ +.so man3/acl_extended_file.3 |