From 256ba8884797809da49252231ed69f7982ad1a10 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 6 Dec 2000 03:16:46 +0000 Subject: Update. 2000-12-05 Ulrich Drepper * sysdeps/unix/sysv/aix/Makefile [$(subdir)==misc] (sysdep_routines): Add restf and savef. * sysdeps/unix/sysv/aix/restf.c: New file. * sysdeps/unix/sysv/aix/savef.c: New file. Patches by Michael Keezer . * sysdeps/unix/opendir.c (__opendir): Don't use o_directory_works if O_DIRECTORY is not defined. Patch by Michael Keezer . * include/libc-symbols.h (C_SYMBOL_DOT_NAME): Define. Patch by Michael Keezer . * locale/programs/linereader.c (get_toplvl_escape): Recognize more than 4 bytes in escape sequence. Patch by Shinya Hanataka . --- sysdeps/unix/opendir.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/opendir.c') diff --git a/sysdeps/unix/opendir.c b/sysdeps/unix/opendir.c index 461f82bc97..927caab70f 100644 --- a/sysdeps/unix/opendir.c +++ b/sysdeps/unix/opendir.c @@ -120,11 +120,15 @@ __opendir (const char *name) O_DIRECTORY flag is honored by the kernel. */ if (__builtin_expect (__fxstat64 (_STAT_VER, fd, &statbuf), 0) < 0) goto lose; - if (o_directory_works <= 0 - && __builtin_expect (! S_ISDIR (statbuf.st_mode), 0)) +#ifdef O_DIRECTORY + if (o_directory_works <= 0) +#endif { - save_errno = ENOTDIR; - goto lose; + if (__builtin_expect (! S_ISDIR (statbuf.st_mode), 0)) + { + save_errno = ENOTDIR; + goto lose; + } } if (__builtin_expect (__fcntl (fd, F_SETFD, FD_CLOEXEC), 0) < 0) -- cgit v1.2.3