mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-18 05:53:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update.

Browse Source 
2003-01-28  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/common/pause.c (do_pause): New function.  Split
	from __libc_pause.  Implement using sigsuspend.
	(__libc_pause): Call do_pause to do the real work.

	* sysdeps/posix/sigpause.c (do_sigpause): Check range of
	sig_or_mask parameter is is_sig != 0.
This commit is contained in:
Ulrich Drepper 2003-01-28 09:08:07 +00:00
parent 0566b130fb
commit 772e3426a7
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2003-01-28 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/common/pause.c (do_pause): New function. Split
from __libc_pause. Implement using sigsuspend.
(__libc_pause): Call do_pause to do the real work.
* sysdeps/posix/sigpause.c (do_sigpause): Check range of
sig_or_mask parameter is is_sig != 0.
2003-01-21 Philip Blundell <philb@gnu.org> 2003-01-21 Philip Blundell <philb@gnu.org>
* sysdeps/unix/sysv/linux/bits/ioctls.h (SIOCSIFNAME): Define. * sysdeps/unix/sysv/linux/bits/ioctls.h (SIOCSIFNAME): Define.

5
sysdeps/posix/sigpause.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,94-98,2000,02 Free Software Foundation, Inc. /* Copyright (C) 1991,92,94-98,2000,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -34,7 +34,8 @@ do_sigpause (int sig_or_mask, int is_sig)
{ {
/* The modern X/Open implementation is requested. */ /* The modern X/Open implementation is requested. */
if (__sigprocmask (0, NULL, &set) < 0 if (__sigprocmask (0, NULL, &set) < 0
/* Yes, we call `sigdelset' and not `__sigdelset'. */ /* Perform the tests from sigdelset ourselves. */
|| sig_or_mask <= 0 || sig_or_mask >= NSIG
|| __sigdelset (&set, sig_or_mask) < 0) || __sigdelset (&set, sig_or_mask) < 0)
return -1; return -1;
} }

20
sysdeps/unix/common/pause.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1996, 2002 Free Software Foundation, Inc. /* Copyright (C) 1991, 1996, 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -22,16 +22,28 @@
/* Suspend the process until a signal arrives. /* Suspend the process until a signal arrives.
This always returns -1 and sets errno to EINTR. */ This always returns -1 and sets errno to EINTR. */
static void
do_pause (void)
{
sigset_t set;
sigemptyset (&set);
__sigsuspend (&set);
}
int int
__libc_pause (void) __libc_pause (void)
{ {
if (SINGLE_THREAD_P) if (SINGLE_THREAD_P)
return __sigpause (__sigblock (0), 0); {
do_pause ();
return -1;
}
int oldtype = LIBC_CANCEL_ASYNC (); int oldtype = LIBC_CANCEL_ASYNC ();
int result = __sigpause (__sigblock (0), 0); (void) do_pause ();
LIBC_CANCEL_RESET (oldtype); LIBC_CANCEL_RESET (oldtype);
return result; return -1;
} }
weak_alias (__libc_pause, pause) weak_alias (__libc_pause, pause)