From d369ad760d0a2bc585cb5b076a67d565573ee915 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 12 Feb 2006 21:41:44 +0000 Subject: [BZ #2226] 2006-02-12 Ulrich Drepper * io/ftw.c: Start using *at functions. * io/ftw64.c: Likewise. * sysdeps/generic/not-cancel.h: Define openat_not_cancel, openat_not_cancel_3, openat64_not_cancel, and openat64_not_cancel_3. * sysdeps/unix/sysv/linux/not-cancel.h: Likewise. * sysdeps/unix/sysv/linux/openat.c: Create separate _nocancel functions. * io/fxstatat.c: Add __fxstatat alias. * sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c: Likewise. * sysdeps/unix/sysv/linux/fxstatat.c: Likewise. Add support for newfstatat syscall. * sysdeps/unix/sysv/linux/i386/fxstatat.c: Add __fxstatat alias. Add support for fstatat64 syscall. * include/sys/stat.h: Declare __fxstatat. * io/fxstatat64.c: Add __fxstatat64 alias. * sysdeps/unix/sysv/linux/fxstatat64.c: Add support for fstatat64 syscall. * dirent/fdopendir.c: Add __fdopendir alias. * sysdeps/unix/fdopendir.c: Likewise. * sysdeps/mach/hurd/fdopendir.c: Likewise. * include/dirent.h: Add __fdopendir declaration. [BZ #2226] * libio/wgenops.c (_IO_wsetb): Use correct size of wide char buffer in FREE_BUF call. --- io/ftw.c | 62 +++++++++++++++++++++++++++++++++++++++++++-------------- io/ftw64.c | 3 ++- io/fxstatat.c | 3 ++- io/fxstatat64.c | 3 ++- 4 files changed, 53 insertions(+), 18 deletions(-) (limited to 'io') diff --git a/io/ftw.c b/io/ftw.c index f24a6b46fe..50303d9cd0 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -66,6 +66,7 @@ char *alloca (); #include #include #include +#include #if HAVE_SYS_PARAM_H || defined _LIBC # include #endif @@ -143,9 +144,11 @@ int rpl_lstat (const char *, struct stat *); # ifdef _LIBC # define LXSTAT __lxstat # define XSTAT __xstat +# define FXSTATAT __fxstatat # else # define LXSTAT(V,f,sb) lstat (f,sb) # define XSTAT(V,f,sb) stat (f,sb) +# define FXSTATAT(V,d,f,sb,m) fstatat (d, f, sb, m) # endif # define FTW_FUNC_T __ftw_func_t # define NFTW_FUNC_T __nftw_func_t @@ -162,6 +165,7 @@ int rpl_lstat (const char *, struct stat *); struct dir_data { DIR *stream; + int streamfd; char *content; }; @@ -263,7 +267,7 @@ find_object (struct ftw_data *data, struct STAT *st) static inline int __attribute ((always_inline)) -open_dir_stream (struct ftw_data *data, struct dir_data *dirp) +open_dir_stream (int *dfdp, struct ftw_data *data, struct dir_data *dirp) { int result = 0; @@ -324,6 +328,7 @@ open_dir_stream (struct ftw_data *data, struct dir_data *dirp) { __closedir (st); data->dirstreams[data->actdir]->stream = NULL; + data->dirstreams[data->actdir]->streamfd = -1; data->dirstreams[data->actdir] = NULL; } } @@ -332,15 +337,28 @@ open_dir_stream (struct ftw_data *data, struct dir_data *dirp) /* Open the new stream. */ if (result == 0) { - const char *name = ((data->flags & FTW_CHDIR) - ? data->dirbuf + data->ftw.base: data->dirbuf); assert (data->dirstreams[data->actdir] == NULL); - dirp->stream = __opendir (name); + if (dfdp != NULL && *dfdp != -1) + { + int fd = openat64_not_cancel_3 (*dfdp, data->dirbuf + data->ftw.base, + O_RDONLY | O_DIRECTORY | O_NDELAY); + dirp->stream = NULL; + if (fd != -1 && (dirp->stream = __fdopendir (fd)) == NULL) + close_not_cancel_no_status (fd); + } + else + { + const char *name = ((data->flags & FTW_CHDIR) + ? data->dirbuf + data->ftw.base: data->dirbuf); + dirp->stream = __opendir (name); + } + if (dirp->stream == NULL) result = -1; else { + dirp->streamfd = dirfd (dirp->stream); dirp->content = NULL; data->dirstreams[data->actdir] = dirp; @@ -356,7 +374,7 @@ open_dir_stream (struct ftw_data *data, struct dir_data *dirp) static int internal_function process_entry (struct ftw_data *data, struct dir_data *dir, const char *name, - size_t namlen) + size_t namlen, int d_type) { struct STAT st; int result = 0; @@ -383,18 +401,28 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name, *((char *) __mempcpy (data->dirbuf + data->ftw.base, name, namlen)) = '\0'; - if ((data->flags & FTW_CHDIR) == 0) - name = data->dirbuf; + int statres; + if (dir->streamfd != -1) + statres = FXSTATAT (_STAT_VER, dir->streamfd, name, &st, + (data->flags & FTW_PHYS) ? AT_SYMLINK_NOFOLLOW : 0); + else + { + if ((data->flags & FTW_CHDIR) == 0) + name = data->dirbuf; + + statres = ((data->flags & FTW_PHYS) + ? LXSTAT (_STAT_VER, name, &st) + : XSTAT (_STAT_VER, name, &st)); + } - if (((data->flags & FTW_PHYS) - ? LXSTAT (_STAT_VER, name, &st) - : XSTAT (_STAT_VER, name, &st)) < 0) + if (statres < 0) { if (errno != EACCES && errno != ENOENT) result = -1; else if (!(data->flags & FTW_PHYS) - && LXSTAT (_STAT_VER, name, &st) == 0 - && S_ISLNK (st.st_mode)) + && (d_type == DT_LNK + || (LXSTAT (_STAT_VER, name, &st) == 0 + && S_ISLNK (st.st_mode)))) flag = FTW_SLN; else flag = FTW_NS; @@ -446,7 +474,8 @@ ftw_dir (struct ftw_data *data, struct STAT *st, struct dir_data *old_dir) /* Open the stream for this directory. This might require that another stream has to be closed. */ - result = open_dir_stream (data, &dir); + result = open_dir_stream (old_dir == NULL ? NULL : &old_dir->streamfd, + data, &dir); if (result != 0) { if (errno == EACCES) @@ -466,6 +495,7 @@ ftw_dir (struct ftw_data *data, struct STAT *st, struct dir_data *old_dir) fail: save_err = errno; __closedir (dir.stream); + dir.streamfd = -1; __set_errno (save_err); if (data->actdir-- == 0) @@ -496,7 +526,7 @@ fail: while (dir.stream != NULL && (d = __readdir64 (dir.stream)) != NULL) { - result = process_entry (data, &dir, d->d_name, NAMLEN (d)); + result = process_entry (data, &dir, d->d_name, NAMLEN (d), d->d_type); if (result != 0) break; } @@ -510,6 +540,7 @@ fail: assert (dir.content == NULL); __closedir (dir.stream); + dir.streamfd = -1; __set_errno (save_err); if (data->actdir-- == 0) @@ -525,7 +556,8 @@ fail: { char *endp = strchr (runp, '\0'); - result = process_entry (data, &dir, runp, endp - runp); + // XXX Should store the d_type values as well?! + result = process_entry (data, &dir, runp, endp - runp, DT_UNKNOWN); runp = endp + 1; } diff --git a/io/ftw64.c b/io/ftw64.c index 7913b7af17..39e6ceabf8 100644 --- a/io/ftw64.c +++ b/io/ftw64.c @@ -1,5 +1,5 @@ /* File tree walker functions. LFS version. - Copyright (C) 1996, 1997, 1998, 2001 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2001, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -26,6 +26,7 @@ #define STAT stat64 #define LXSTAT __lxstat64 #define XSTAT __xstat64 +#define FXSTATAT __fxstatat64 #define FTW_FUNC_T __ftw64_func_t #define NFTW_FUNC_T __nftw64_func_t diff --git a/io/fxstatat.c b/io/fxstatat.c index 62f7fe3efb..2486c73c84 100644 --- a/io/fxstatat.c +++ b/io/fxstatat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. +/* Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -45,5 +45,6 @@ __fxstatat (int vers, int fd, const char *filename, struct stat *buf, int flag) __set_errno (ENOSYS); return -1; } +libc_hidden_def (__fxstatat) stub_warning (fstatat) #include diff --git a/io/fxstatat64.c b/io/fxstatat64.c index ba95b73e81..20bdd610c3 100644 --- a/io/fxstatat64.c +++ b/io/fxstatat64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. +/* Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -46,5 +46,6 @@ __fxstatat64 (int vers, int fd, const char *filename, struct stat64 *buf, __set_errno (ENOSYS); return -1; } +libc_hidden_def (__fxstatat64) stub_warning (fstatat64) #include -- cgit v1.2.3