diff options
author | Ulrich Drepper <drepper@redhat.com> | 2003-07-15 07:52:52 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2003-07-15 07:52:52 +0000 |
commit | 73299943388c0eebf6a9c8d6288e9da8289f9dca (patch) | |
tree | 6da8f169d3c1867e38c1eaad12876981845e3cd5 /sysdeps/unix/opendir.c | |
parent | da35d15e2b2b51fae6265a0906e87cfd5e4df98f (diff) | |
download | glibc-73299943388c0eebf6a9c8d6288e9da8289f9dca.tar.gz glibc-73299943388c0eebf6a9c8d6288e9da8289f9dca.tar.xz glibc-73299943388c0eebf6a9c8d6288e9da8289f9dca.zip |
Update.
More cancellation handling fixups. * sysdeps/unix/sysv/linux/not-cancel.h: Add waitpid_not_cancel. * sysdeps/generic/not-cancel.h: Likewise. * catgets/open_catalog.c: Use not-cancelable syscalls. * time/Makefile (CFLAGS-getdate.c): Add -fexceptions. * sysdeps/unix/sysv/linux/llseek.c: Must not be cancelable. * sysdeps/unix/syscalls.list: Don't mark lseek as cancelable. * dlfcn/dlfcn.h: Mark dlopen with __THROW again. * io/fcntl.h: Don't mark posix_fallocate with __THROW. * libio/fileops.c: Use not-cancelable syscalls for fclose. * libio/iopopen.c: Use no-cancelable syscalls. * libio/stdio.h: Mark popen and pclose with __THROW again. * misc/Makefile (CFLAGS-syslog.c): Add -fexceptions. * misc/syslog.c: Fix locking and cancellation cleanup handling. * posix/unistd.h: Mark ttyname and ttyname_r again with __THROW. * stdio-common/Makefile (CFLAGS-tmpfile.c, CFLAGS-tmpfile64.c, CFLAGS-tempname.c): Add -fexceptions. * stdlib/Makefile (CFLAGS-mkstemp.c): Add -fexceptions. * string/string.h: Mark strerror and strerror_r with _THROW again. * sysdeps/generic/unwind.inc: New file. Copied from gcc. * sysdeps/generic/unwind-dw2.c: Update from gcc version. Remove #ifs since we now need all the code compiled. * sysdeps/posix/spawni.c: Use close_not_cancel instead of close. * sysdeps/unix/closedir.c: Use not-cancelable syscalls. * sysdeps/unix/opendir.c: Likewise.
Diffstat (limited to 'sysdeps/unix/opendir.c')
-rw-r--r-- | sysdeps/unix/opendir.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sysdeps/unix/opendir.c b/sysdeps/unix/opendir.c index dac1db5e55..5e7c6e54a6 100644 --- a/sysdeps/unix/opendir.c +++ b/sysdeps/unix/opendir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1996,98,2000-2002 Free Software Foundation, Inc. +/* Copyright (C) 1991-1996,98,2000-2002, 2003 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 @@ -28,6 +28,8 @@ #include <stdio.h> #include <dirstream.h> +#include <not-cancel.h> + /* opendir() must not accidentally open something other than a directory. Some OS's have kernel support for that, some don't. In the worst @@ -50,11 +52,11 @@ static void tryopen_o_directory (void) { int serrno = errno; - int x = __open ("/dev/null", O_RDONLY|O_NDELAY|O_DIRECTORY); + int x = open_not_cancel_2 ("/dev/null", O_RDONLY|O_NDELAY|O_DIRECTORY); if (x >= 0) { - __close (x); + close_not_cancel_no_status (x); o_directory_works = -1; } else if (errno != ENOTDIR) @@ -110,7 +112,7 @@ __opendir (const char *name) } } - fd = __open64 (name, O_RDONLY|O_NDELAY|EXTRA_FLAGS); + fd = open_not_cancel_2 (name, O_RDONLY|O_NDELAY|EXTRA_FLAGS|O_LARGEFILE); if (__builtin_expect (fd, 0) < 0) return NULL; @@ -148,7 +150,7 @@ __opendir (const char *name) lose: { save_errno = errno; - (void) __close (fd); + close_not_cancel_no_status (fd); __set_errno (save_errno); return NULL; } |