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/acl_entries.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/acl_entries.c')
| -rw-r--r-- | lib/acl_entries.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/acl_entries.c b/lib/acl_entries.c index 59dd420eaf4..ce730d466e1 100644 --- a/lib/acl_entries.c +++ b/lib/acl_entries.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include "acl-internal.h" | 22 | #include "acl-internal.h" |
| 23 | 23 | ||
| 24 | /* This file assumes POSIX-draft like ACLs | 24 | /* This file assumes POSIX-draft like ACLs |
| 25 | (Linux, FreeBSD, Mac OS X, IRIX, Tru64). */ | 25 | (Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5). */ |
| 26 | 26 | ||
| 27 | /* Return the number of entries in ACL. | 27 | /* Return the number of entries in ACL. |
| 28 | Return -1 and set errno upon failure to determine it. */ | 28 | Return -1 and set errno upon failure to determine it. */ |
| @@ -34,7 +34,7 @@ acl_entries (acl_t acl) | |||
| 34 | 34 | ||
| 35 | if (acl != NULL) | 35 | if (acl != NULL) |
| 36 | { | 36 | { |
| 37 | #if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, Mac OS X */ | 37 | #if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, Mac OS X, Cygwin >= 2.5 */ |
| 38 | # if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */ | 38 | # if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */ |
| 39 | /* acl_get_entry returns 0 when it successfully fetches an entry, | 39 | /* acl_get_entry returns 0 when it successfully fetches an entry, |
| 40 | and -1/EINVAL at the end. */ | 40 | and -1/EINVAL at the end. */ |
| @@ -45,7 +45,7 @@ acl_entries (acl_t acl) | |||
| 45 | got_one >= 0; | 45 | got_one >= 0; |
| 46 | got_one = acl_get_entry (acl, ACL_NEXT_ENTRY, &ace)) | 46 | got_one = acl_get_entry (acl, ACL_NEXT_ENTRY, &ace)) |
| 47 | count++; | 47 | count++; |
| 48 | # else /* Linux, FreeBSD */ | 48 | # else /* Linux, FreeBSD, Cygwin >= 2.5 */ |
| 49 | /* acl_get_entry returns 1 when it successfully fetches an entry, | 49 | /* acl_get_entry returns 1 when it successfully fetches an entry, |
| 50 | and 0 at the end. */ | 50 | and 0 at the end. */ |
| 51 | acl_entry_t ace; | 51 | acl_entry_t ace; |