picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* sysdeps/mach/hurd/sigwait.c (__sigwait): When returning immediately,

Browse source 
check only (SS->pending & MASK) for the signal to return.
	From Jeroen Dekkers <jeroen@dekkers.cx>.

	* iconv/skeleton.c [!RESET_INPUT_BUFFER && !SAVE_RESET_STATE]:
	Use preprocessor #if conditionals instead of `if' to avoid
	warnings about divide by zero in dead code.
This commit is contained in:
Roland McGrath 2001-12-26 20:10:32 +00:00
parent a5eb7027b9
commit 362f8329cc
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,5 +1,15 @@
2001-12-26 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/sigwait.c (__sigwait): When returning immediately,
check only (SS->pending & MASK) for the signal to return.
From Jeroen Dekkers <jeroen@dekkers.cx>.
2001-12-22 Roland McGrath <roland@frob.com>
* iconv/skeleton.c [!RESET_INPUT_BUFFER && !SAVE_RESET_STATE]:
Use preprocessor #if conditionals instead of `if' to avoid
warnings about divide by zero in dead code.
* hurd/Versions (libc: GLIBC_2.2.5): Add _hurd_port_set,
_hurd_port_init, and __hurd_self_sigstate.

15
sysdeps/mach/hurd/sigwait.c
View file

@ -1,4 +1,4 @@
/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
/* Copyright (C) 1996,97,2001 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,7 +28,7 @@ int
__sigwait (const sigset_t *set, int *sig)
{
struct hurd_sigstate *ss;
sigset_t mask;
sigset_t mask, ready;
int signo = 0;
struct hurd_signal_preemptor preemptor;
jmp_buf buf;
@ -72,20 +72,21 @@ __sigwait (const sigset_t *set, int *sig)
ss = _hurd_self_sigstate ();
__spin_lock (&ss->lock);
/* See if one of these signals is currently pending */
if (ss->pending & mask)
/* See if one of these signals is currently pending. */
ready = ss->pending & mask;
if (ready)
{
for (signo = 1; signo < NSIG; signo++)
if (__sigismember (&ss->pending, signo))
if (__sigismember (&ready, signo))
{
__sigdelset (&ss->pending, signo);
__sigdelset (&ready, signo);
goto all_done;
}
/* Huh? Where'd it go? */
abort ();
}
/* Wait for one of them to show up */
/* Wait for one of them to show up. */
if (!setjmp (buf))
{