diff options
Diffstat (limited to 'io')
| -rw-r--r-- | io/ftw.c | 10 | ||||
| -rw-r--r-- | io/ftw64.c | 4 |
2 files changed, 5 insertions, 9 deletions
@@ -37,8 +37,6 @@ # define NFTW_NAME nftw # define INO_T ino_t # define STAT stat -# define DIRENT dirent -# define READDIR __readdir # define LXSTAT __lxstat # define XSTAT __xstat # define FTW_FUNC_T __ftw_func_t @@ -163,10 +161,10 @@ open_dir_stream (struct ftw_data *data, struct dir_data *dirp) else { DIR *st = data->dirstreams[data->actdir]->stream; - struct DIRENT *d; + struct dirent64 *d; size_t actsize = 0; - while ((d = READDIR (st)) != NULL) + while ((d = __readdir64 (st)) != NULL) { size_t this_len = _D_EXACT_NAMLEN (d); if (actsize + this_len + 2 >= bufsize) @@ -340,7 +338,7 @@ internal_function ftw_dir (struct ftw_data *data, struct STAT *st) { struct dir_data dir; - struct DIRENT *d; + struct dirent64 *d; int previous_base = data->ftw.base; int result; char *startp; @@ -402,7 +400,7 @@ ftw_dir (struct ftw_data *data, struct STAT *st) *startp++ = '/'; data->ftw.base = startp - data->dirbuf; - while (dir.stream != NULL && (d = READDIR (dir.stream)) != NULL) + while (dir.stream != NULL && (d = __readdir64 (dir.stream)) != NULL) { result = process_entry (data, &dir, d->d_name, _D_EXACT_NAMLEN (d)); if (result != 0) diff --git a/io/ftw64.c b/io/ftw64.c index 6a3c93f88b..5294b9b2e2 100644 --- a/io/ftw64.c +++ b/io/ftw64.c @@ -1,5 +1,5 @@ /* File tree walker functions. LFS version. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -22,8 +22,6 @@ #define NFTW_NAME nftw64 #define INO_T ino64_t #define STAT stat64 -#define DIRENT dirent64 -#define READDIR __readdir64 #define LXSTAT __lxstat64 #define XSTAT __xstat64 #define FTW_FUNC_T __ftw64_func_t |