diff options
Diffstat (limited to 'io')
| -rw-r--r-- | io/Makefile | 4 | ||||
| -rw-r--r-- | io/ftw.c | 5 | ||||
| -rw-r--r-- | io/ftw.h | 46 | ||||
| -rw-r--r-- | io/ftw64-time64.c | 34 |
4 files changed, 83 insertions, 6 deletions
diff --git a/io/Makefile b/io/Makefile index 12c832cfcb..d35e966258 100644 --- a/io/Makefile +++ b/io/Makefile @@ -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 diff --git a/io/ftw.c b/io/ftw.c index baca3deeee..ce1c6a14a3 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -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 */ diff --git a/io/ftw.h b/io/ftw.h index 751d689cdb..446498856d 100644 --- a/io/ftw.h +++ b/io/ftw.h @@ -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 diff --git a/io/ftw64-time64.c b/io/ftw64-time64.c new file mode 100644 index 0000000000..7c9db5448a --- /dev/null +++ b/io/ftw64-time64.c @@ -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 |