diff options
| author | Paul Eggert | 2018-10-08 18:21:47 -0700 |
|---|---|---|
| committer | Paul Eggert | 2018-10-08 18:22:22 -0700 |
| commit | cf1ebfa055fcd0749aa4ed2fc4c399470b9eb3de (patch) | |
| tree | 8af8b5c52560c91b2094dae951b082c370496aea /lib/get-permissions.c | |
| parent | fc6004e61760d3bd3e27b593c318e634a221652c (diff) | |
| download | emacs-cf1ebfa055fcd0749aa4ed2fc4c399470b9eb3de.tar.gz emacs-cf1ebfa055fcd0749aa4ed2fc4c399470b9eb3de.zip | |
Update from Gnulib
This incorporates:
2018-10-05 explicit_bzero: make it possible to namespace
2018-10-04 fcntl: make it possible to namespace
2018-10-01 mkostemp, mkostemps: fix C++ compilation on Mac OS X
2018-09-19 maint: mktime.c now shared with glibc
2018-09-18 file-has-acl: fix test failure on Cygwin 2.9
2018-09-18 gettime: nanotime never existed
* admin/merge-gnulib (AVOIDED_MODULES): Add mkdir.
* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
* lib/acl_entries.c, lib/explicit_bzero.c, lib/fcntl.c:
* lib/get-permissions.c, lib/gettime.c, lib/mktime.c:
* lib/set-permissions.c, lib/stdlib.in.h, m4/acl.m4, m4/gettime.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'lib/get-permissions.c')
| -rw-r--r-- | lib/get-permissions.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/get-permissions.c b/lib/get-permissions.c index 83ba2639a17..3b984510955 100644 --- a/lib/get-permissions.c +++ b/lib/get-permissions.c | |||
| @@ -38,9 +38,9 @@ get_permissions (const char *name, int desc, mode_t mode, | |||
| 38 | 38 | ||
| 39 | #if USE_ACL && HAVE_ACL_GET_FILE | 39 | #if USE_ACL && HAVE_ACL_GET_FILE |
| 40 | /* POSIX 1003.1e (draft 17 -- abandoned) specific version. */ | 40 | /* POSIX 1003.1e (draft 17 -- abandoned) specific version. */ |
| 41 | /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ | 41 | /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */ |
| 42 | # if !HAVE_ACL_TYPE_EXTENDED | 42 | # if !HAVE_ACL_TYPE_EXTENDED |
| 43 | /* Linux, FreeBSD, IRIX, Tru64 */ | 43 | /* Linux, FreeBSD, IRIX, Tru64, Cygwin >= 2.5 */ |
| 44 | 44 | ||
| 45 | if (HAVE_ACL_GET_FD && desc != -1) | 45 | if (HAVE_ACL_GET_FD && desc != -1) |
| 46 | ctx->acl = acl_get_fd (desc); | 46 | ctx->acl = acl_get_fd (desc); |
| @@ -60,13 +60,13 @@ get_permissions (const char *name, int desc, mode_t mode, | |||
| 60 | return -1; | 60 | return -1; |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | # if HAVE_ACL_TYPE_NFS4 /* FreeBSD */ | 63 | # if HAVE_ACL_TYPE_NFS4 /* FreeBSD */ |
| 64 | 64 | ||
| 65 | /* TODO (see set_permissions). */ | 65 | /* TODO (see set_permissions). */ |
| 66 | 66 | ||
| 67 | # endif | 67 | # endif |
| 68 | 68 | ||
| 69 | # else /* HAVE_ACL_TYPE_EXTENDED */ | 69 | # else /* HAVE_ACL_TYPE_EXTENDED */ |
| 70 | /* Mac OS X */ | 70 | /* Mac OS X */ |
| 71 | 71 | ||
| 72 | /* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS) | 72 | /* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS) |