diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2012-05-11 15:35:48 +0800 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-05-11 15:35:48 +0800 |
| commit | bd9195d134a60d79cf531a3f91b59a9981702b7f (patch) | |
| tree | 81046410cf64f9cf5cf6b9316819a01f84d91e41 /hurd | |
| parent | 937ccbb0fefee902716c495020b4a87f92796379 (diff) | |
| parent | 836b9ff049842ad31e114989fc5b7f14ed63c3ae (diff) | |
Merge branch 't/init-first.c' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
bits/in.h
hurd/catch-signal.c
sysdeps/mach/hurd/accept.c
sysdeps/mach/hurd/accept4.c
sysdeps/mach/hurd/bits/socket.h
sysdeps/mach/hurd/dl-sysdep.c
sysdeps/mach/hurd/dup2.c
sysdeps/mach/hurd/dup3.c
sysdeps/mach/hurd/i386/____longjmp_chk.S
sysdeps/mach/hurd/i386/init-first.c
sysdeps/mach/hurd/kernel-features.h
sysdeps/mach/hurd/opendir.c
sysdeps/mach/hurd/symlink.c
sysdeps/mach/hurd/symlinkat.c
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/catch-signal.c | 5 | ||||
| -rw-r--r-- | hurd/hurd/fd.h | 3 | ||||
| -rw-r--r-- | hurd/intern-fd.c | 2 | ||||
| -rw-r--r-- | hurd/port2fd.c | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/hurd/catch-signal.c b/hurd/catch-signal.c index 06d81c14b9..3f946e1033 100644 --- a/hurd/catch-signal.c +++ b/hurd/catch-signal.c @@ -1,5 +1,5 @@ /* Convenience function to catch expected signals during an operation. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996-2012 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 @@ -27,6 +27,9 @@ hurd_catch_signal (sigset_t sigset, error_t (*operate) (struct hurd_signal_preemptor *), sighandler_t handler) { + /* We need to restore the signal mask, because otherwise the + signal-handling code will have blocked the caught signal and for + instance calling hurd_catch_signal again would then dump core. */ sigjmp_buf buf; void throw (int signo, long int sigcode, struct sigcontext *scp) { siglongjmp (buf, scp->sc_error ?: EGRATUITOUS); } diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h index 8d18cb4b96..b807461e1a 100644 --- a/hurd/hurd/fd.h +++ b/hurd/hurd/fd.h @@ -1,6 +1,5 @@ /* File descriptors. - Copyright (C) 1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2006,2007 - Free Software Foundation, Inc. + Copyright (C) 1993-2012 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 diff --git a/hurd/intern-fd.c b/hurd/intern-fd.c index d149f39c01..ac89173942 100644 --- a/hurd/intern-fd.c +++ b/hurd/intern-fd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1994-2012 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 diff --git a/hurd/port2fd.c b/hurd/port2fd.c index a6ec701821..451d6306e7 100644 --- a/hurd/port2fd.c +++ b/hurd/port2fd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1997, 1999, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1994-2012 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 |