public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Samuel Thibault <sthibaul@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] hurd: Fix glob lstat compatibility
Date: Thu, 22 Jul 2021 18:31:57 +0000 (GMT)	[thread overview]
Message-ID: <20210722183157.4744A3853802@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9a7ab0769b295cbf5232140401742a8f34bda3de

commit 9a7ab0769b295cbf5232140401742a8f34bda3de
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Thu Jul 22 18:29:57 2021 +0000

    hurd: Fix glob lstat compatibility
    
    84f7ce84474c ("posix: Add glob64 with 64-bit time_t support") replaced
    GLOB_NO_LSTAT with defining GLOB_LSTAT and GLOB_LSTAT64, but the posix
    and gnu versions of the change were missing in the commit.

Diff:
---
 posix/glob-lstat-compat.c       | 3 ++-
 sysdeps/gnu/glob-lstat-compat.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/posix/glob-lstat-compat.c b/posix/glob-lstat-compat.c
index 00d791d03b..f91c7cc2d4 100644
--- a/posix/glob-lstat-compat.c
+++ b/posix/glob-lstat-compat.c
@@ -28,7 +28,8 @@
 # define GLOB_ATTRIBUTE attribute_compat_text_section
 
 /* Avoid calling gl_lstat with GLOB_ALTDIRFUNC.  */
-# define GLOB_NO_LSTAT
+# define GLOB_LSTAT   gl_stat
+# define GLOB_LSTAT64 __stat64
 
 # include <posix/glob.c>
 
diff --git a/sysdeps/gnu/glob-lstat-compat.c b/sysdeps/gnu/glob-lstat-compat.c
index 128f84c07c..caa485935e 100644
--- a/sysdeps/gnu/glob-lstat-compat.c
+++ b/sysdeps/gnu/glob-lstat-compat.c
@@ -29,7 +29,8 @@
 #define GLOB_ATTRIBUTE attribute_compat_text_section
 
 /* Avoid calling gl_lstat with GLOB_ALTDIRFUNC.  */
-#define GLOB_NO_LSTAT
+#define GLOB_LSTAT   gl_stat
+#define GLOB_LSTAT64 __stat64
 
 #include <posix/glob.c>


                 reply	other threads:[~2021-07-22 18:31 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210722183157.4744A3853802@sourceware.org \
    --to=sthibaul@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).