@@ -1 +1,19 @@
+#ifndef _FTW_H
#include <io/ftw.h>
+
+#ifndef _ISOMAC
+# if __TIMESIZE != 64
+# include <sys/stat.h>
+
+typedef int (*__ftw64_time64_func_t) (const char *,
+ const struct __stat64_t64 *, int);
+typedef int (*__nftw64_time64_func_t) (const char *,
+ const struct __stat64_t64 *, int,
+ struct FTW *);
+
+extern int __ftw64_time64 (const char *, __ftw64_time64_func_t, int);
+extern int __nftw64_time64 (const char *, __nftw64_time64_func_t, int, int);
+# endif
+#endif
+
+#endif /* _FTW_H */
@@ -55,7 +55,8 @@ routines := \
posix_fallocate posix_fallocate64 \
sendfile sendfile64 copy_file_range \
utimensat futimens file_change_detection \
- fts64-time64
+ fts64-time64 \
+ ftw64-time64
others := pwd
test-srcs := ftwtest
@@ -106,6 +107,7 @@ CFLAGS-fts64.c += -Wno-uninitialized $(uses-callbacks) -fexceptions
CFLAGS-fts64-time64.c += -Wno-uninitialized $(uses-callbacks) -fexceptions
CFLAGS-ftw.c += $(uses-callbacks) -fexceptions
CFLAGS-ftw64.c += $(uses-callbacks) -fexceptions
+CFLAGS-ftw64-time64.c += $(uses-callbacks) -fexceptions
CFLAGS-posix_fallocate.c += -fexceptions
CFLAGS-posix_fallocate64.c += -fexceptions
CFLAGS-fallocate.c += -fexceptions
@@ -821,7 +821,7 @@ FTW_NAME (const char *path, FTW_FUNC_T func, int descriptors)
return ftw_startup (path, 0, func, descriptors, 0);
}
-#ifndef _LIBC
+#ifndef NFTW_OLD_NAME
int
NFTW_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags)
{
@@ -844,7 +844,6 @@ NFTW_NEW_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags)
}
return ftw_startup (path, 1, func, descriptors, flags);
}
-
versioned_symbol (libc, NFTW_NEW_NAME, NFTW_NAME, GLIBC_2_3_3);
# if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_3_3)
@@ -863,4 +862,4 @@ NFTW_OLD_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags)
compat_symbol (libc, NFTW_OLD_NAME, NFTW_NAME, GLIBC_2_1);
# endif
-#endif
+#endif /* NFTW_OLD_NAME */
@@ -137,15 +137,36 @@ extern int ftw (const char *__dir, __ftw_func_t __func, int __descriptors)
__nonnull ((1, 2));
#else
# ifdef __REDIRECT
+# ifndef __USE_TIME_BITS64
extern int __REDIRECT (ftw, (const char *__dir, __ftw_func_t __func,
int __descriptors), ftw64) __nonnull ((1, 2));
+# else
+extern int __REDIRECT (ftw, (const char *__dir, __ftw_func_t __func,
+ int __descriptors), __ftw64_time64)
+ __nonnull ((1, 2));
+# endif
# else
-# define ftw ftw64
+# ifndef __USE_TIME_BITS64
+# define ftw ftw64
+# else
+# define ftw __ftw64_time64
+# endif
# endif
#endif
#ifdef __USE_LARGEFILE64
+# ifndef __USE_TIME_BITS64
extern int ftw64 (const char *__dir, __ftw64_func_t __func,
int __descriptors) __nonnull ((1, 2));
+# else
+# ifdef __REDIRECT
+extern int __REDIRECT (ftw64, (const char *__dir, __ftw64_func_t __func,
+ int __descriptors),
+ __ftw64_time64)
+ __nonnull ((1, 2));
+# else
+# define nftw64 __nftw64_time64
+# endif
+# endif
#endif
#ifdef __USE_XOPEN_EXTENDED
@@ -159,16 +180,37 @@ extern int nftw (const char *__dir, __nftw_func_t __func, int __descriptors,
int __flag) __nonnull ((1, 2));
# else
# ifdef __REDIRECT
+# ifndef __USE_TIME_BITS64
extern int __REDIRECT (nftw, (const char *__dir, __nftw_func_t __func,
int __descriptors, int __flag), nftw64)
__nonnull ((1, 2));
+# else
+extern int __REDIRECT (nftw, (const char *__dir, __nftw_func_t __func,
+ int __descriptors, int __flag), __nftw64_time64)
+ __nonnull ((1, 2));
+# endif
# else
-# define nftw nftw64
+# ifndef __USE_TIME_BITS64
+# define nftw nftw64
+# else
+# define nftw __nftw64_time64
+# endif
# endif
# endif
# ifdef __USE_LARGEFILE64
+# ifndef __USE_TIME_BITS64
extern int nftw64 (const char *__dir, __nftw64_func_t __func,
int __descriptors, int __flag) __nonnull ((1, 2));
+# else
+# ifdef __REDIRECT
+extern int __REDIRECT (nftw64, (const char *__dir, __nftw64_func_t __func,
+ int __descriptors, int __flag),
+ __nftw64_time64)
+ __nonnull ((1, 2));
+# else
+# define nftw64 __nftw64_time64
+# endif
+# endif
# endif
#endif
new file mode 100644
@@ -0,0 +1,34 @@
+/* File tree walker functions. LFS version.
+ Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <sys/types.h>
+
+#if __TIMESIZE != 64
+# define FTW_NAME __ftw64_time64
+# define NFTW_NAME __nftw64_time64
+# define INO_T ino64_t
+# define STRUCT_STAT __stat64_t64
+# define LSTAT __lstat64_time64
+# define STAT __stat64_time64
+# define FSTATAT __fstatat64_time64
+# define FTW_FUNC_T __ftw64_time64_func_t
+# define NFTW_FUNC_T __nftw64_time64_func_t
+
+# include "ftw.c"
+#endif
@@ -211,6 +211,8 @@ libc {
__fts64_read_time64;
__fts64_set_time64;
__fts64_children_time64;
+ __ftw64_time64;
+ __nftw64_time64;
__getitimer64;
__getrusage64;
__gettimeofday64;
@@ -208,6 +208,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -227,6 +228,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -205,6 +205,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -224,6 +225,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2295,6 +2295,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2314,6 +2315,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2249,6 +2249,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2268,6 +2269,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2432,6 +2432,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2452,6 +2453,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -209,6 +209,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -228,6 +229,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2376,6 +2376,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2395,6 +2396,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2346,6 +2346,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2365,6 +2366,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2343,6 +2343,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2362,6 +2363,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2341,6 +2341,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2360,6 +2361,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2339,6 +2339,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2358,6 +2359,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2347,6 +2347,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2366,6 +2367,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2385,6 +2385,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2404,6 +2405,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2403,6 +2403,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2422,6 +2423,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2436,6 +2436,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2455,6 +2456,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2401,6 +2401,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2420,6 +2421,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2256,6 +2256,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2275,6 +2276,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2253,6 +2253,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2272,6 +2273,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F
@@ -2394,6 +2394,7 @@ GLIBC_2.34 __fts64_close_time64 F
GLIBC_2.34 __fts64_open_time64 F
GLIBC_2.34 __fts64_read_time64 F
GLIBC_2.34 __fts64_set_time64 F
+GLIBC_2.34 __ftw64_time64 F
GLIBC_2.34 __futimens64 F
GLIBC_2.34 __futimes64 F
GLIBC_2.34 __futimesat64 F
@@ -2413,6 +2414,7 @@ GLIBC_2.34 __mktime64 F
GLIBC_2.34 __msgctl64 F
GLIBC_2.34 __mtx_timedlock64 F
GLIBC_2.34 __nanosleep64 F
+GLIBC_2.34 __nftw64_time64 F
GLIBC_2.34 __ntp_gettime64 F
GLIBC_2.34 __ntp_gettimex64 F
GLIBC_2.34 __ppoll64 F