aboutsummaryrefslogtreecommitdiff
path: root/catgets
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-07-15 07:52:52 +0000
committerUlrich Drepper <drepper@redhat.com>2003-07-15 07:52:52 +0000
commit73299943388c0eebf6a9c8d6288e9da8289f9dca (patch)
tree6da8f169d3c1867e38c1eaad12876981845e3cd5 /catgets
parentda35d15e2b2b51fae6265a0906e87cfd5e4df98f (diff)
downloadglibc-73299943388c0eebf6a9c8d6288e9da8289f9dca.zip
glibc-73299943388c0eebf6a9c8d6288e9da8289f9dca.tar.gz
glibc-73299943388c0eebf6a9c8d6288e9da8289f9dca.tar.bz2
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 'catgets')
-rw-r--r--catgets/open_catalog.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c
index 674a0c1..8c563b2 100644
--- a/catgets/open_catalog.c
+++ b/catgets/open_catalog.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper, <drepper@gnu.org>.
@@ -30,6 +30,7 @@
#include <sys/stat.h>
#include "catgetsinfo.h"
+#include <not-cancel.h>
#define SWAPU32(w) bswap_32 (w)
@@ -49,7 +50,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var,
int result = -1;
if (strchr (cat_name, '/') != NULL || nlspath == NULL)
- fd = __open (cat_name, O_RDONLY);
+ fd = open_not_cancel_2 (cat_name, O_RDONLY);
else
{
const char *run_nlspath = nlspath;
@@ -177,7 +178,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var,
if (bufact != 0)
{
- fd = __open (buf, O_RDONLY);
+ fd = open_not_cancel_2 (buf, O_RDONLY);
if (fd >= 0)
break;
}
@@ -233,8 +234,8 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var,
/* Save read, handle partial reads. */
do
{
- size_t now = __read (fd, (((char *) catalog->file_ptr)
- + (st.st_size - todo)), todo);
+ size_t now = read_not_cancel (fd, (((char *) catalog->file_ptr)
+ + (st.st_size - todo)), todo);
if (now == 0 || now == (size_t) -1)
{
#ifdef EINTR
@@ -324,7 +325,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var,
/* Release the lock again. */
close_unlock_return:
- __close (fd);
+ close_not_cancel_no_status (fd);
return result;
}