diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2025-01-16 23:19:27 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2025-01-16 23:22:34 -0800 |
| commit | bc4c5818dfb3c16f817514d3ae3bc074b4c4c007 (patch) | |
| tree | cf498c2867ebb1c5e9dcb61b32bd75ec739a51e0 /lib | |
| parent | 37b5b3ea91a4ed005664540091e5150d2454d8d6 (diff) | |
Update from Gnulib by running admin/merge-gnulib
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/file-has-acl.c | 7 | ||||
| -rw-r--r-- | lib/getopt-pfx-core.h | 3 | ||||
| -rw-r--r-- | lib/gnulib.mk.in | 14 |
3 files changed, 14 insertions, 10 deletions
diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c index e8413f8f85f..c02cfee842b 100644 --- a/lib/file-has-acl.c +++ b/lib/file-has-acl.c @@ -101,14 +101,15 @@ enum { /* AI indicates XATTR may be present but wasn't accessible. This is the case when [l]listxattr failed with E2BIG, - or failed with EACCES which in Linux kernel 6.12 NFS can mean merely - that we lack read access. + or is not supported (!acl_errno_valid()), or failed with EACCES + which in Linux kernel 6.12 NFS can mean merely that we lack read access. */ static bool aclinfo_may_indicate_xattr (struct aclinfo const *ai) { - return ai->size < 0 && (ai->u.err == EACCES || ai->u.err == E2BIG); + return ai->size < 0 && (!acl_errno_valid (ai->u.err) + || ai->u.err == EACCES || ai->u.err == E2BIG); } /* Does NAME have XATTR? */ diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h index 391c7af8e71..7c5ea094683 100644 --- a/lib/getopt-pfx-core.h +++ b/lib/getopt-pfx-core.h @@ -37,6 +37,9 @@ # if defined _AIX || defined __hpux || defined __sun || defined __QNX__ # include <stdio.h> # endif +# if defined MUSL_LIBC || (defined __FreeBSD__ || defined __DragonFly__) || defined __NetBSD__ || defined __OpenBSD__ || (defined __APPLE__ && defined __MACH__) || defined _AIX || defined __sun || defined __minix || defined __HAIKU__ +# include <unistd.h> +# endif # ifndef __GETOPT_ID # define __GETOPT_CONCAT(x, y) x ## y diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in index b1f0053e582..ce874048f4a 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in @@ -2616,17 +2616,17 @@ ifneq (,$(GL_GENERATE_GMP_H_CONDITION)) ifneq (,$(GL_GENERATE_MINI_GMP_H_CONDITION)) # Build gmp.h as a wrapper for mini-gmp.h when using mini-gmp. gmp.h: $(top_builddir)/config.status - echo '#include "mini-gmp.h"' > $@-t - echo '#if GNULIB_LIBGMP_MPQ' >> $@-t - echo '# include "mini-mpq.h"' >> $@-t - echo '#endif' >> $@-t - mv $@-t $@ + $(gl_V_at)echo '#include "mini-gmp.h"' > $@-t + $(AM_V_at)echo '#if GNULIB_LIBGMP_MPQ' >> $@-t + $(AM_V_at)echo '# include "mini-mpq.h"' >> $@-t + $(AM_V_at)echo '#endif' >> $@-t + $(AM_V_at)mv $@-t $@ endif ifneq (,$(GL_GENERATE_GMP_GMP_H_CONDITION)) # Build gmp.h as a wrapper for gmp/gmp.h. gmp.h: $(top_builddir)/config.status - echo '#include <gmp/gmp.h>' > $@-t - mv $@-t $@ + $(gl_V_at)echo '#include <gmp/gmp.h>' > $@-t + $(AM_V_at)mv $@-t $@ endif else gmp.h: $(top_builddir)/config.status |