summaryrefslogtreecommitdiff
path: root/lib/get-permissions.c
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2018-09-18 22:58:23 +0200
committerBruno Haible <bruno@clisp.org>2018-09-18 22:58:23 +0200
commitf88c93f4b5ca570e102878720aa7f6c584bcc6fd (patch)
tree911d9c09b7fcd0bc748304da2d9bb9bb40aad2d3 /lib/get-permissions.c
parented0c9d87bfcbfd7fd0e534f160ab8b733e4e64a6 (diff)
downloadgnulib-f88c93f4b5ca570e102878720aa7f6c584bcc6fd.tar.gz
file-has-acl: Fix test failure on Cygwin 2.9.
* m4/acl.m4 (gl_FUNC_ACL): Update comments regarding Cygwin. * lib/acl-internal.h: Likewise. (HAVE_ACL_EXTENDED_FILE): Undefine on Cygwin. * lib/acl-internal.c: Update comments regarding Cygwin. * lib/acl_entries.c: Likewise. * lib/file-has-acl.c: Likewise. (file_has_acl): For Cygwin, use a different way to determine whether the "default" ACL of a directory is nontrivial. * lib/get-permissions.c: Update comments regarding Cygwin. * lib/set-permissions.c: Likewise.
Diffstat (limited to 'lib/get-permissions.c')
-rw-r--r--lib/get-permissions.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/get-permissions.c b/lib/get-permissions.c
index 83ba2639a1..3b98451095 100644
--- a/lib/get-permissions.c
+++ b/lib/get-permissions.c
@@ -38,9 +38,9 @@ get_permissions (const char *name, int desc, mode_t mode,
#if USE_ACL && HAVE_ACL_GET_FILE
/* POSIX 1003.1e (draft 17 -- abandoned) specific version. */
- /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
+ /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
# if !HAVE_ACL_TYPE_EXTENDED
- /* Linux, FreeBSD, IRIX, Tru64 */
+ /* Linux, FreeBSD, IRIX, Tru64, Cygwin >= 2.5 */
if (HAVE_ACL_GET_FD && desc != -1)
ctx->acl = acl_get_fd (desc);
@@ -60,13 +60,13 @@ get_permissions (const char *name, int desc, mode_t mode,
return -1;
}
-# if HAVE_ACL_TYPE_NFS4 /* FreeBSD */
+# if HAVE_ACL_TYPE_NFS4 /* FreeBSD */
/* TODO (see set_permissions). */
-# endif
+# endif
-# else /* HAVE_ACL_TYPE_EXTENDED */
+# else /* HAVE_ACL_TYPE_EXTENDED */
/* Mac OS X */
/* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS)