From: Bruno Haible Date: Mon, 7 Oct 2024 12:59:00 +0000 (+0200) Subject: file-has-acl: Fix test failure on Cygwin. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=6e398bee5adc9a88a0023767c457621e596e44c4;p=gnulib.git file-has-acl: Fix test failure on Cygwin. * lib/file-has-acl.c (file_has_aclinfo): On Cygwin, don't fail if acl_get_file (name, ACL_TYPE_DEFAULT) returns NULL on a file of unknown type. --- diff --git a/ChangeLog b/ChangeLog index d58f75c05f..3cfb8d854e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-10-07 Bruno Haible + + file-has-acl: Fix test failure on Cygwin. + * lib/file-has-acl.c (file_has_aclinfo): On Cygwin, don't fail if + acl_get_file (name, ACL_TYPE_DEFAULT) returns NULL on a file of unknown + type. + 2024-10-07 Bruno Haible file-has-acl: Fix performance regression on FreeBSD, Cygwin. diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c index 0dfd25b52a..64291e02d4 100644 --- a/lib/file-has-acl.c +++ b/lib/file-has-acl.c @@ -483,7 +483,14 @@ file_has_aclinfo (MAYBE_UNUSED char const *restrict name, # endif } else - ret = -1; + { +# ifdef __CYGWIN__ /* Cygwin >= 2.5 */ + if (d_type == DT_UNKNOWN) + ret = 0; + else +# endif + ret = -1; + } } # endif }