diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-09-07 06:21:02 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-09-07 06:21:02 +0000 |
| commit | 675e4015896d39a88264d4db515c6824bdd6bf27 (patch) | |
| tree | 20986ad19f4aa5662c67e6ba4246241f9dfa4a7a /sysdeps/unix | |
| parent | 04ba87901c8be7f38906147854e0fc1e4351f486 (diff) | |
| download | glibc-675e4015896d39a88264d4db515c6824bdd6bf27.tar.gz glibc-675e4015896d39a88264d4db515c6824bdd6bf27.tar.xz glibc-675e4015896d39a88264d4db515c6824bdd6bf27.zip | |
Update.
* sysdeps/unix/opendir.c: If O_DIRECTORY_WORKS is defined don't use the hack with tryopen_o_directory to determine at runtime whether it works. * sysdeps/unix/sysv/linux/opendir.c: New file. * sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_O_DIRECTORY if kernel knows O_DIRECTORY.
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/opendir.c | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/opendir.c | 26 |
3 files changed, 37 insertions, 0 deletions
diff --git a/sysdeps/unix/opendir.c b/sysdeps/unix/opendir.c index cf030e02f4..ad91931de4 100644 --- a/sysdeps/unix/opendir.c +++ b/sysdeps/unix/opendir.c @@ -40,6 +40,10 @@ a guinea pig. It may be missing in chroot environments, so we make sure to fail safe. */ #ifdef O_DIRECTORY +# ifdef O_DIRECTORY_WORKS +# define o_directory_works 1 +# define tryopen_o_directory() while (1) /* This must not be called. */ +# else static int o_directory_works; static void @@ -60,6 +64,7 @@ tryopen_o_directory (void) __set_errno (serrno); } +# endif # define EXTRA_FLAGS O_DIRECTORY #else # define EXTRA_FLAGS 0 diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 2f9d12bb28..c7ff66e2e4 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -142,3 +142,9 @@ #if __LINUX_KERNEL_VERSION >= 132097 # define __ASSUME_GETDENTS64_SYSCALL 1 #endif + +/* When did O_DIRECTORY became available? Early in 2.3 but when? + Be safe, use 2.3.99. */ +#if __LINUX_KERNEL_VERSION >= 131939 +# define __ASSUME_O_DIRECTORY 1 +#endif diff --git a/sysdeps/unix/sysv/linux/opendir.c b/sysdeps/unix/sysv/linux/opendir.c new file mode 100644 index 0000000000..f58b379ef6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/opendir.c @@ -0,0 +1,26 @@ +/* Copyright (C) 2000 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include "kernel-features.h" + + +#ifdef __ASSUME_O_DIRECTORY +# define O_DIRECTORY_WORKS 1 +#endif + +#include <sysdeps/unix/opendir.c> |