mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
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.
This commit is contained in:
@ -47,6 +47,7 @@
|
||||
# include "../iconv/gconv_charset.h"
|
||||
# include "../iconv/gconv_int.h"
|
||||
# include <shlib-compat.h>
|
||||
# include <not-cancel.h>
|
||||
#endif
|
||||
#ifndef errno
|
||||
extern int errno;
|
||||
@ -1240,14 +1241,18 @@ _IO_file_close_mmap (fp)
|
||||
/* In addition to closing the file descriptor we have to unmap the file. */
|
||||
(void) __munmap (fp->_IO_buf_base, fp->_IO_buf_end - fp->_IO_buf_base);
|
||||
fp->_IO_buf_base = fp->_IO_buf_end = NULL;
|
||||
return close (fp->_fileno);
|
||||
/* Cancelling close should be avoided if possible since it leaves an
|
||||
unrecoverable state behind. */
|
||||
return close_not_cancel (fp->_fileno);
|
||||
}
|
||||
|
||||
int
|
||||
_IO_file_close (fp)
|
||||
_IO_FILE *fp;
|
||||
{
|
||||
return close (fp->_fileno);
|
||||
/* Cancelling close should be avoided if possible since it leaves an
|
||||
unrecoverable state behind. */
|
||||
return close_not_cancel (fp->_fileno);
|
||||
}
|
||||
INTDEF(_IO_file_close)
|
||||
|
||||
|
Reference in New Issue
Block a user