diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-07-14 22:29:16 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-07-14 22:30:01 -0700 |
commit | c40ea1328bb33abaec14f1fc92ac2349b5ee2715 (patch) | |
tree | 8686d9899315dd1bea97c92078d20a42eb07b0aa /lib/acl-internal.c | |
parent | ff0e184ef3af49b19cdfb5ee5bb24212676c800b (diff) | |
download | emacs-c40ea1328bb33abaec14f1fc92ac2349b5ee2715.tar.gz |
Merge from gnulib
This incorporates:
2015-07-05 acl-permissions: Document FreeBSD ACL_TYPE_NFS4 acls
2015-07-05 acl-permissions: Fix on FreeBSD
2015-07-05 file-has-acl, acl-permissions: fix some more HP-UX typos
* lib/acl-internal.c, lib/acl-internal.h, lib/get-permissions.c:
* lib/set-permissions.c: Copy from gnulib.
Diffstat (limited to 'lib/acl-internal.c')
-rw-r--r-- | lib/acl-internal.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/acl-internal.c b/lib/acl-internal.c index 1a2f8c44bf7..1eaa671bd37 100644 --- a/lib/acl-internal.c +++ b/lib/acl-internal.c @@ -115,6 +115,13 @@ acl_access_nontrivial (acl_t acl) # endif } +int +acl_default_nontrivial (acl_t acl) +{ + /* acl is non-trivial if it is non-empty. */ + return (acl_entries (acl) > 0); +} + # endif #elif USE_ACL && HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */ |