mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Update from Gnulib by running admin/merge-gnulib

Browse source
This commit is contained in:
Paul Eggert 2025-01-16 23:19:27 -08:00
parent 37b5b3ea91
commit bc4c5818df
4 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/file-has-acl.c
View file

@ -101,14 +101,15 @@ enum {
/* AI indicates XATTR may be present but wasn't accessible. /* AI indicates XATTR may be present but wasn't accessible.
This is the case when [l]listxattr failed with E2BIG, This is the case when [l]listxattr failed with E2BIG,
or failed with EACCES which in Linux kernel 6.12 NFS can mean merely or is not supported (!acl_errno_valid()), or failed with EACCES
that we lack read access. which in Linux kernel 6.12 NFS can mean merely that we lack read access.
*/ */
static bool static bool
aclinfo_may_indicate_xattr (struct aclinfo const *ai) 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? */ /* Does NAME have XATTR? */

3
lib/getopt-pfx-core.h
View file

@ -37,6 +37,9 @@
# if defined _AIX || defined __hpux || defined __sun || defined __QNX__ # if defined _AIX || defined __hpux || defined __sun || defined __QNX__
# include <stdio.h> # include <stdio.h>
# endif # 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 # ifndef __GETOPT_ID
# define __GETOPT_CONCAT(x, y) x ## y # define __GETOPT_CONCAT(x, y) x ## y

14
lib/gnulib.mk.in
View file

@ -2616,17 +2616,17 @@ ifneq (,$(GL_GENERATE_GMP_H_CONDITION))
ifneq (,$(GL_GENERATE_MINI_GMP_H_CONDITION)) ifneq (,$(GL_GENERATE_MINI_GMP_H_CONDITION))
# Build gmp.h as a wrapper for mini-gmp.h when using mini-gmp. # Build gmp.h as a wrapper for mini-gmp.h when using mini-gmp.
gmp.h: $(top_builddir)/config.status gmp.h: $(top_builddir)/config.status
echo '#include "mini-gmp.h"' > $@-t $(gl_V_at)echo '#include "mini-gmp.h"' > $@-t
echo '#if GNULIB_LIBGMP_MPQ' >> $@-t $(AM_V_at)echo '#if GNULIB_LIBGMP_MPQ' >> $@-t
echo '# include "mini-mpq.h"' >> $@-t $(AM_V_at)echo '# include "mini-mpq.h"' >> $@-t
echo '#endif' >> $@-t $(AM_V_at)echo '#endif' >> $@-t
mv $@-t $@ $(AM_V_at)mv $@-t $@
endif endif
ifneq (,$(GL_GENERATE_GMP_GMP_H_CONDITION)) ifneq (,$(GL_GENERATE_GMP_GMP_H_CONDITION))
# Build gmp.h as a wrapper for gmp/gmp.h. # Build gmp.h as a wrapper for gmp/gmp.h.
gmp.h: $(top_builddir)/config.status gmp.h: $(top_builddir)/config.status
echo '#include <gmp/gmp.h>' > $@-t $(gl_V_at)echo '#include <gmp/gmp.h>' > $@-t
mv $@-t $@ $(AM_V_at)mv $@-t $@
endif endif
else else
gmp.h: $(top_builddir)/config.status gmp.h: $(top_builddir)/config.status

1
m4/gnulib-comp.m4
View file

@ -388,6 +388,7 @@ AC_DEFUN([gl_INIT],
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT], [1]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT], [1])
]) ])
gl_UNISTD_MODULE_INDICATOR([getopt-posix]) gl_UNISTD_MODULE_INDICATOR([getopt-posix])
gl_MUSL_LIBC
AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_CANONICAL_HOST])
gl_FUNC_GETRANDOM gl_FUNC_GETRANDOM
gl_CONDITIONAL([GL_COND_OBJ_GETRANDOM], gl_CONDITIONAL([GL_COND_OBJ_GETRANDOM],