diff options
author | davidxu <davidxu@FreeBSD.org> | 2003-09-25 06:23:40 +0000 |
---|---|---|
committer | davidxu <davidxu@FreeBSD.org> | 2003-09-25 06:23:40 +0000 |
commit | c0197faefe86e09d714f07d049afe6da9c4b6e2e (patch) | |
tree | 1fb88119411cd73f339061eeaabf1b1cb4cbd56e /lib/libkse/thread/thr_sigaction.c | |
parent | b8306c28e9a7940e023e1132173fb79c10747785 (diff) | |
download | FreeBSD-src-c0197faefe86e09d714f07d049afe6da9c4b6e2e.zip FreeBSD-src-c0197faefe86e09d714f07d049afe6da9c4b6e2e.tar.gz |
If syscall failed, restore old sigaction and return error to thread.
Diffstat (limited to 'lib/libkse/thread/thr_sigaction.c')
-rw-r--r-- | lib/libkse/thread/thr_sigaction.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/lib/libkse/thread/thr_sigaction.c b/lib/libkse/thread/thr_sigaction.c index ed84c20..694f37e 100644 --- a/lib/libkse/thread/thr_sigaction.c +++ b/lib/libkse/thread/thr_sigaction.c @@ -42,6 +42,7 @@ int _sigaction(int sig, const struct sigaction * act, struct sigaction * oact) { int ret = 0; + int err = 0; struct sigaction newact, oldact; struct pthread *curthread; kse_critical_t crit; @@ -58,14 +59,8 @@ _sigaction(int sig, const struct sigaction * act, struct sigaction * oact) crit = _kse_critical_enter(); curthread = _get_curthread(); KSE_LOCK_ACQUIRE(curthread->kse, &_thread_signal_lock); - /* - * Check if the existing signal action structure contents are - * to be returned: - */ - if (oact != NULL) { - /* Return the existing signal action contents: */ - oldact = _thread_sigact[sig - 1]; - } + + oldact = _thread_sigact[sig - 1]; /* Check if a signal action was supplied: */ if (act != NULL) { @@ -94,14 +89,27 @@ _sigaction(int sig, const struct sigaction * act, struct sigaction * oact) newact.sa_handler = (void (*) ())_thr_sig_handler; } /* Change the signal action in the kernel: */ - if (__sys_sigaction(sig, &newact, NULL) != 0) + if (__sys_sigaction(sig, &newact, NULL) != 0) { + _thread_sigact[sig - 1] = oldact; + /* errno is in kse, will copy it to thread */ + err = errno; ret = -1; + } } KSE_LOCK_RELEASE(curthread->kse, &_thread_signal_lock); _kse_critical_leave(crit); - - if (oact != NULL) + /* + * Check if the existing signal action structure contents are + * to be returned: + */ + if (oact != NULL) { + /* Return the existing signal action contents: */ *oact = oldact; + } + if (ret != 0) { + /* Return errno to thread */ + errno = err; + } } /* Return the completion status: */ |