Mercurial > hg > octave-shane > gnulib-hg
changeset 17580:f20720b48838
qacl: port to Windows better
See Eli Zaretskii in
<http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00593.html>.
* 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.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Tue, 17 Dec 2013 10:49:01 -0800 |
| parents | 2f05c67c13f6 |
| children | 1a0eb4e01632 |
| files | ChangeLog lib/file-has-acl.c |
| diffstat | 2 files changed, 15 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-12-17 Paul Eggert <eggert@cs.ucla.edu> + + qacl: port to Windows better + See Eli Zaretskii in + <http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00593.html>. + * 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 <lav@netis.ru> md5, sha1, sha256, sha512: fix (trivial) compile error in c++ mode.
--- a/lib/file-has-acl.c +++ b/lib/file-has-acl.c @@ -75,8 +75,7 @@ } 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 @@ } 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 @@ } return 0; -# endif +# else + + errno = ENOSYS; + return -1; # endif }