summaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-06-03 21:53:09 +0000
committerUlrich Drepper <drepper@redhat.com>1997-06-03 21:53:09 +0000
commitb13927da591adbbae887fc89cc66c8ca7ab5b13b (patch)
tree5462fdfeeca042253cf3bb208ffd7db1acff7425 /io
parentf671aeab4e17d6dc1c3ca96ac5cb2c3e04570082 (diff)
Update.
1997-06-03 23:42 Ulrich Drepper <drepper@cygnus.com> * elf/dl-support.c: Define and initialize _dl_verbose used in dl-machine.h. * io/ftw.c: Expand stat/lstat calls. * manual/intro.texi: Also refer to ISO 9945. Update info about SVID. Add description for XPG. * md5-crypt/md5-crypt.c: Namespace cleanups. * md5-crypt/md5.c: Likewise. * md5-crypt/md5.h: Likewise. * sysdeps/generic/crypt-entry.c: Likewise. * posix/unistd.h (_POSIX2_C_VERSION): Set to 199209L. * stdlib/fmtmsg.h: Declare addseverity only if __USE_SVID is defined. * sunrpc/rpc_scan.c (findkind): Declare `token' as const. * sunrpc/rpc_util.c (toktostr): Declare `token' as const. * time/Makefile: Make tzselect dependen of config.make. 1997-06-01 15:01 Miles Bader <miles@gnu.ai.mit.edu> * manual/string.texi (String and Array Utilities): Add `Argz and Envz Vectors' to the menu. (Argz and Envz Vectors, Argz Functions, Envz Functions): New nodes. 1997-05-31 20:59 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * login/Makefile (utmpd-routines): Add utmpd. (extra-objs): Add utmpd objects to get dependencies. (distribute): Add sources for utmpd. (subdir-dirs): Define. 1997-06-02 16:28 Ulrich Drepper <drepper@cygnus.com> * sysdeps/wordsize-32/inttypes.h: Include features.h and use __CONCAT instead of defined __CONCAT__ ourself. * sysdeps/wordsize-64/inttypes.h: Likewise. 1997-06-01 19:11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/wordsize-64/inttypes.h (INTMAX_C): Use `l' suffix, not `ll'. (PRIdFAST, PRIoFAST, PRIxFAST, PRIuFAST, SCNdFAST, SCNiFAST, SCNoFAST, SCNxFAST): Correct format specifiers. 1997-06-02 04:23 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/syscalls.list: Make fchdir weak alias for __fchdir. 1997-06-01 19:17 Ulrich Drepper <drepper@cygnus.com> * md5-crypt/Makefile: Correct libmd5crypt file to really generate DES free libcrypt. * md5-crypt/onlymd5-entry.c: New file. Wrapper around sysdeps/generic/crypt-entry.c. 1997-06-01 12:48 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/alpha/gnu/types.h (__fd_mask): Change type to `unsigned long int'. Patch by Richard Henderson <richard@twiddle.rth.home>. 1997-05-30 17:34 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/generic/bb_init_func.c (__bb_init_func): Use ISO C declaration style. * nss/nss_files/files-hosts.c: Delete inclusion of "../resolv/mapv4v6hostent.h".
Diffstat (limited to 'io')
-rw-r--r--io/ftw.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/io/ftw.c b/io/ftw.c
index 7367f9733e..c53773d0c1 100644
--- a/io/ftw.c
+++ b/io/ftw.c
@@ -243,12 +243,14 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name,
memcpy (data->dirbuf + data->ftw.base, name, namlen);
data->dirbuf[data->ftw.base + namlen] = '\0';
- if (((data->flags & FTW_PHYS) ? lstat : stat) (data->dirbuf, &st) < 0)
+ if (((data->flags & FTW_PHYS)
+ ? __lxstat (_STAT_VER, data->dirbuf, &st)
+ : __xstat (_STAT_VER, data->dirbuf, &st)) < 0)
{
if (errno != EACCES && errno != ENOENT)
result = -1;
else if (!(data->flags & FTW_PHYS)
- && lstat (data->dirbuf, &st) == 0
+ && __lxstat (_STAT_VER, data->dirbuf, &st) == 0
&& S_ISLNK (st.st_mode))
flag = FTW_SLN;
else
@@ -265,8 +267,8 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name,
}
if (result == 0
- && (!(data->flags & FTW_MOUNT) || flag == FTW_NS
- || st.st_dev == data->dev))
+ && (flag == FTW_NS
+ || !(data->flags & FTW_MOUNT) || st.st_dev == data->dev))
{
if ((data->flags & FTW_PHYS) || flag == FTW_NS
|| (!find_object (data, &st)
@@ -282,7 +284,7 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name,
/* Change back to current directory. */
int done = 0;
if (dir->stream != NULL)
- if (fchdir (dirfd (dir->stream)) == 0)
+ if (__fchdir (dirfd (dir->stream)) == 0)
done = 1;
if (!done)
@@ -347,7 +349,7 @@ ftw_dir (struct ftw_data *data, struct stat *st)
/* If necessary, change to this directory. */
if (data->flags & FTW_CHDIR)
{
- if (fchdir (dirfd (dir.stream)) < 0)
+ if (__fchdir (dirfd (dir.stream)) < 0)
{
if (errno == ENOSYS)
{
@@ -521,13 +523,16 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
/* Get stat info for start directory. */
if (result == 0)
- if (((flags & FTW_PHYS) ? lstat : stat) (data.dirbuf, &st) < 0)
+ if (((flags & FTW_PHYS)
+ ? __lxstat (_STAT_VER, data.dirbuf, &st)
+ : __xstat (_STAT_VER, data.dirbuf, &st)) < 0)
{
if (errno == EACCES)
result = (*data.func) (data.dirbuf, &st, FTW_NS, &data.ftw);
else if (!(flags & FTW_PHYS)
&& errno == ENOENT
- && lstat (dir, &st) == 0 && S_ISLNK (st.st_mode))
+ && __lxstat (_STAT_VER, dir, &st) == 0
+ && S_ISLNK (st.st_mode))
result = (*data.func) (data.dirbuf, &st, data.cvt_arr[FTW_SLN],
&data.ftw);
else