From 2958e6cc5f39ac2487b4fcbc2db48462a34ce23d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 13 Feb 2001 22:17:17 +0000 Subject: Update. * io/ftw.c: Always use readdir64. * io/ftw64.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. * sysdeps/generic/glob.c: Likewise. Convert results if gl_readdir callback to dirent. Still allow compiling outside glibc. * sysdeps/gnu/glob64.c: Define COMPILE_GLOB64. * sysdeps/unix/sysv/linux/i386/glob64.c: Likewise. * malloc/mtrace.c: Use fopen64. * posix/spawni.c: Use __open64. * sysdeps/unix/opendir.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/generic/ftruncate64.c: Define __ftruncate64 and make old name a weak alias. * sysdeps/unix/sysv/aix/ftruncate64.c: Likewise. * sysdeps/unix/sysv/linux/ftruncate64.c: Likewise. * sysdeps/unix/sysv/linux/mips/ftruncate64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/ftruncate64.c: Likewise. * resolv/res_data.c: Add cast to avoid warning. * include/unistd.h: Declare __ftruncate64. * sysdeps/generic/utmp_file.c: Use LFS functions and type. --- io/ftw.c | 10 ++++------ io/ftw64.c | 4 +--- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'io') diff --git a/io/ftw.c b/io/ftw.c index dc02ebf205..3635cba681 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -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 , 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 -- cgit v1.2.3