From 59fbaca6b9b48c217c60fc5ab21240ba104059e8 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Tue, 4 Nov 2025 09:14:54 -0800
Subject: Update from Gnulib by running admin/merge-gnulib

* admin/merge-gnulib (GNULIB_MODULES): Add stringeq.
With current Gnulib it is already present as in indirect dependency;
listing it here because Emacs now depends on it directly.
* lib-src/ebrowse.c, lib-src/etags.c:
(streq): Remove, as Gnulib defines this now.
* lib/fseterr.c, lib/fseterr.h, lib/issymlink.c, lib/issymlink.h:
* lib/issymlinkat.c, lib/stdio-consolesafe.c, lib/string.c:
* m4/fseterr.m4, m4/gettext_h.m4, m4/stringeq.m4:
New files from Gnulib.
* src/conf_post.h (tzfree) [__ANDROID_API__ >= 35]: Remove.
---
 lib/qcopy-acl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/qcopy-acl.c')

diff --git a/lib/qcopy-acl.c b/lib/qcopy-acl.c
index 282f4b2d2a5..e86e15544f6 100644
--- a/lib/qcopy-acl.c
+++ b/lib/qcopy-acl.c
@@ -50,9 +50,9 @@ is_attr_permissions (const char *name, struct error_context *ctx)
 {
   /* We need to explicitly test for the known extended attribute names,
      because at least on CentOS 7, attr_copy_action does not do it.  */
-  return strcmp (name, XATTR_NAME_POSIX_ACL_ACCESS) == 0
-         || strcmp (name, XATTR_NAME_POSIX_ACL_DEFAULT) == 0
-         || strcmp (name, XATTR_NAME_NFSV4_ACL) == 0
+  return streq (name, XATTR_NAME_POSIX_ACL_ACCESS)
+         || streq (name, XATTR_NAME_POSIX_ACL_DEFAULT)
+         || streq (name, XATTR_NAME_NFSV4_ACL)
          || attr_copy_action (name, ctx) == ATTR_ACTION_PERMISSIONS;
 }
 
-- 
cgit v1.2.1