diff options
Diffstat (limited to 'sysdeps/unix')
-rw-r--r-- | sysdeps/unix/closedir.c | 7 | ||||
-rw-r--r-- | sysdeps/unix/opendir.c | 12 | ||||
-rw-r--r-- | sysdeps/unix/syscalls.list | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/llseek.c | 21 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/not-cancel.h | 31 |
6 files changed, 36 insertions, 39 deletions
diff --git a/sysdeps/unix/closedir.c b/sysdeps/unix/closedir.c index c2fcbe5..09deee7 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) diff --git a/sysdeps/unix/opendir.c b/sysdeps/unix/opendir.c index dac1db5..5e7c6e5 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; } diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list index db83cee..b6e178b 100644 --- a/sysdeps/unix/syscalls.list +++ b/sysdeps/unix/syscalls.list @@ -24,7 +24,7 @@ getuid - getuid Ei: __getuid getuid ioctl - ioctl i:iiI __ioctl ioctl kill - kill i:ii __kill kill link - link i:ss __link link -lseek - lseek Ci:iii __libc_lseek __lseek lseek +lseek - lseek i:iii __libc_lseek __lseek lseek mkdir - mkdir i:si __mkdir mkdir open - open Ci:siv __libc_open __open open profil - profil i:piii __profil profil diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index e78c959..f2e8630 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -351,7 +351,7 @@ it was introduced in 2.6.0-test1 which unfortunately cannot be distinguished from 2.6.0. */ #if (__LINUX_KERNEL_VERSION >= 132427 && defined __i386__) \ - || (__LINUX_KERNEL_VERSION >= 132609 && defined __alpha__) \ + || (__LINUX_KERNEL_VERSION >= 132609 && defined __alpha__) # define __ASSUME_TGKILL 1 #endif diff --git a/sysdeps/unix/sysv/linux/llseek.c b/sysdeps/unix/sysv/linux/llseek.c index 9ee340d..dcfd9dd 100644 --- a/sysdeps/unix/sysv/linux/llseek.c +++ b/sysdeps/unix/sysv/linux/llseek.c @@ -1,5 +1,5 @@ /* Long-long seek operation. - Copyright (C) 1996,1997,1998,1999,2000,2002 Free Software Foundation, Inc. + Copyright (C) 1996-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 @@ -20,7 +20,7 @@ #include <errno.h> #include <sys/types.h> -#include <sysdep-cancel.h> +#include <sysdep.h> #include <sys/syscall.h> extern int __syscall__llseek (int fd, off_t offset_hi, off_t offset_lo, @@ -34,20 +34,9 @@ __llseek (int fd, loff_t offset, int whence) { loff_t retval; - if (SINGLE_THREAD_P) - return (loff_t) (INLINE_SYSCALL (_llseek, 5, fd, (off_t) (offset >> 32), - (off_t) (offset & 0xffffffff), - __ptrvalue (&retval), whence) ?: retval); - - int oldtype = LIBC_CANCEL_ASYNC (); - - int result = (loff_t) INLINE_SYSCALL (_llseek, 5, fd, (off_t) (offset >> 32), - (off_t) (offset & 0xffffffff), - __ptrvalue (&retval), whence); - - LIBC_CANCEL_RESET (oldtype); - - return (loff_t) result ?: retval; + return (loff_t) (INLINE_SYSCALL (_llseek, 5, fd, (off_t) (offset >> 32), + (off_t) (offset & 0xffffffff), + __ptrvalue (&retval), whence) ?: retval); } weak_alias (__llseek, llseek) strong_alias (__llseek, __libc_lseek64) diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h index fcd0187..c716419 100644 --- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -21,33 +21,36 @@ #include <sysdep.h> /* Uncancelable open. */ -#ifdef INLINE_SYSCALL -# define open_not_cancel(name, flags, mode) \ +#define open_not_cancel(name, flags, mode) \ INLINE_SYSCALL (open, 3, (const char *) (name), (flags), (mode)) -#endif +#define open_not_cancel_2(name, flags) \ + INLINE_SYSCALL (open, 2, (const char *) (name), (flags)) /* Uncancelable close. */ -#ifdef INLINE_SYSCALL -# define close_not_cancel_no_status(fd) \ +#define close_not_cancel(fd) \ + INLINE_SYSCALL (close, 1, fd) +#define close_not_cancel_no_status(fd) \ (void) ({ INTERNAL_SYSCALL_DECL (err); \ INTERNAL_SYSCALL (close, err, 1, (fd)); }) -#endif /* Uncancelable read. */ -#ifdef INLINE_SYSCALL -# define read_not_cancel(fd, buf, n) \ +#define read_not_cancel(fd, buf, n) \ INLINE_SYSCALL (read, 3, (fd), (buf), (n)) -#endif /* Uncancelable write. */ -#ifdef INLINE_SYSCALL -# define write_not_cancel(fd, buf, n) \ +#define write_not_cancel(fd, buf, n) \ INLINE_SYSCALL (write, 3, (fd), (buf), (n)) -#endif /* Uncancelable writev. */ -#ifdef INLINE_SYSCALL -# define writev_not_cancel_no_status(fd, iov, n) \ +#define writev_not_cancel_no_status(fd, iov, n) \ (void) ({ INTERNAL_SYSCALL_DECL (err); \ INTERNAL_SYSCALL (writev, err, 3, (fd), (iov), (n)); }) + +/* Uncancelable waitpid. */ +#ifdef __NR_waitpid +# define waitpid_not_cancel(pid, stat_loc, options) \ + INLINE_SYSCALL (waitpid, 3, pid, stat_loc, options) +#else +# define waitpid_not_cancel(pid, stat_loc, options) \ + INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL) #endif |