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

diff --git a/src/ChangeLog b/src/ChangeLog
index 58e3eab8339b674ed3cdedc08f24066b419ff1d6..f28a6a63ec4145767801d5a0061721b7597f616e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/fileio.c b/src/fileio.c
index cd32821ed0c08be65a77b369aa902b6179639986..c87a6f713124252a7c33b413306dca0edba08d69 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -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;