Port to OS X ACLs.

* fileio.c (Ffile_acl): Port to OS X, where acl_get_file (...,
ACL_TYPE_ACCESS) doesn't work.

Fixes: debbugs:17810
This commit is contained in:
Paul Eggert 2014-06-21 00:03:41 -07:00
parent 55d4eba2d0
commit d895e63e96
2 changed files with 10 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2014-06-21 Paul Eggert <eggert@cs.ucla.edu>
Port to OS X ACLs (Bug#17810).
* fileio.c (Ffile_acl): Port to OS X, where acl_get_file (...,
ACL_TYPE_ACCESS) doesn't work.
2014-06-19 Stefan Monnier <monnier@iro.umontreal.ca>
* keyboard.c (read_key_sequence): Don't invoke Vprefix_help_command

View file

@ -3013,6 +3013,9 @@ was unable to determine the ACL entries. */)
acl_t acl;
Lisp_Object acl_string;
char *str;
# ifndef HAVE_ACL_TYPE_EXTENDED
acl_type_t ACL_TYPE_EXTENDED = ACL_TYPE_ACCESS;
# endif
#endif
absname = expand_and_dir_to_file (filename,
@ -3027,7 +3030,7 @@ was unable to determine the ACL entries. */)
#ifdef HAVE_ACL_SET_FILE
absname = ENCODE_FILE (absname);
acl = acl_get_file (SSDATA (absname), ACL_TYPE_ACCESS);
acl = acl_get_file (SSDATA (absname), ACL_TYPE_EXTENDED);
if (acl == NULL)
return Qnil;