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/closedir.c | |
| parent | da35d15e2b2b51fae6265a0906e87cfd5e4df98f (diff) | |
| download | glibc-73299943388c0eebf6a9c8d6288e9da8289f9dca.tar.gz | |
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/closedir.c')
| -rw-r--r-- | sysdeps/unix/closedir.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sysdeps/unix/closedir.c b/sysdeps/unix/closedir.c index c2fcbe549a..09deee7e85 100644 --- a/sysdeps/unix/closedir.c +++ b/sysdeps/unix/closedir.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991,1993,1995,1996,1998,2002 Free Software Foundation, Inc. +/* Copyright (C) 1991,1993,1995,1996,1998,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 @@ -22,6 +23,8 @@ #include <dirent.h> #include <unistd.h> #include <dirstream.h> +#include <not-cancel.h> + /* Close the directory stream DIRP. Return 0 if successful, -1 if not. */ @@ -46,6 +49,6 @@ __closedir (DIR *dirp) free ((void *) dirp); - return __close (fd); + return close_not_cancel (fd); } weak_alias (__closedir, closedir) |