diff options
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/lockf.c | 5 | ||||
| -rw-r--r-- | sysdeps/generic/pselect.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sysdeps/generic/lockf.c b/sysdeps/generic/lockf.c index 182a70094c..7b23f66bc9 100644 --- a/sysdeps/generic/lockf.c +++ b/sysdeps/generic/lockf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1994,1996,1997,1998,2000,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 @@ -67,5 +67,8 @@ lockf (int fd, int cmd, off_t len) return -1; } + /* lockf() is a cancellation point but so is fcntl() if F_SETLKW is + used. Therefore we don't have to care about cancellation here, + the fcntl() function will take care of it. */ return __fcntl (fd, cmd, &fl); } diff --git a/sysdeps/generic/pselect.c b/sysdeps/generic/pselect.c index e090d6e526..43b371cce7 100644 --- a/sysdeps/generic/pselect.c +++ b/sysdeps/generic/pselect.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,2001,2002,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -50,6 +50,9 @@ do_pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, if (sigmask != NULL) __sigprocmask (SIG_SETMASK, sigmask, &savemask); + /* Note the pselect() is a cancellation point. But since we call + select() which itself is a cancellation point we do not have + to do anything here. */ retval = __select (nfds, readfds, writefds, exceptfds, timeout != NULL ? &tval : NULL); |