[Emacs-diffs] emacs-24 r117271: Port to OS X ACLs.

[Paul Eggert]

------------------------------------------------------------
revno: 117271
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17810
committer: Paul Eggert <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-06-21 00:03:41 -0700
message:
  Port to OS X ACLs.
  
  * fileio.c (Ffile_acl): Port to OS X, where acl_get_file (...,
  ACL_TYPE_ACCESS) doesn't work.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/fileio.c                   fileio.c-20091113204419-o5vbwnq5f7feedwu-210

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-19 03:48:18 +0000
+++ b/src/ChangeLog     2014-06-21 07:03:41 +0000
@@ -1,3 +1,9 @@
+2014-06-21  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * keyboard.c (read_key_sequence): Don't invoke Vprefix_help_command

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2014-06-08 00:59:05 +0000
+++ b/src/fileio.c      2014-06-21 07:03:41 +0000
@@ -3013,6 +3013,9 @@
   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 @@
 #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;