From e7086a9a301ffcfef17edbcba9e7c0312c33f7a8 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 17 Dec 2013 10:49:01 -0800 Subject: [PATCH] qacl: port to Windows better See Eli Zaretskii in . * lib/file-has-acl.c (acl_access_nontrivial): Return -1 and set errno if !HAVE_ACL_FIRST_ENTRY && !HAVE_ACL_TO_SHORT_TEXT && !HAVE_ACL_FREE_TEXT. --- ChangeLog | 9 +++++++++ lib/file-has-acl.c | 11 ++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea8b1ab03..e4525aa7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-12-17 Paul Eggert + + qacl: port to Windows better + See Eli Zaretskii in + . + * lib/file-has-acl.c (acl_access_nontrivial): + Return -1 and set errno if !HAVE_ACL_FIRST_ENTRY && + !HAVE_ACL_TO_SHORT_TEXT && !HAVE_ACL_FREE_TEXT. + 2013-12-12 Alexander V. Lukyanov md5, sha1, sha256, sha512: fix (trivial) compile error in c++ mode. diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c index bb8bae128..53ac317c0 100644 --- a/lib/file-has-acl.c +++ b/lib/file-has-acl.c @@ -75,8 +75,7 @@ acl_access_nontrivial (acl_t acl) } return got_one; -# else /* IRIX, Tru64 */ -# if HAVE_ACL_TO_SHORT_TEXT /* IRIX */ +# elif HAVE_ACL_TO_SHORT_TEXT /* IRIX */ /* Don't use acl_get_entry: it is undocumented. */ int count = acl->acl_cnt; @@ -93,8 +92,7 @@ acl_access_nontrivial (acl_t acl) } return 0; -# endif -# if HAVE_ACL_FREE_TEXT /* Tru64 */ +# elif HAVE_ACL_FREE_TEXT /* Tru64 */ /* Don't use acl_get_entry: it takes only one argument and does not work. */ int count = acl->acl_num; @@ -117,7 +115,10 @@ acl_access_nontrivial (acl_t acl) } return 0; -# endif +# else + + errno = ENOSYS; + return -1; # endif } -- 2.11.0