From d895e63e96baf3f5ae1fdb32dafc65f0031bd610 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 21 Jun 2014 00:03:41 -0700 Subject: [PATCH] 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 --- src/ChangeLog | 6 ++++++ src/fileio.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 58e3eab8339..f28a6a63ec4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-06-21 Paul Eggert + + 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 * keyboard.c (read_key_sequence): Don't invoke Vprefix_help_command diff --git a/src/fileio.c b/src/fileio.c index cd32821ed0c..c87a6f71312 100644 --- 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; -- 2.39.5