summaryrefslogtreecommitdiffstats
path: root/usr.bin/doscmd/signal.c
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>1999-09-29 20:09:19 +0000
committermarcel <marcel@FreeBSD.org>1999-09-29 20:09:19 +0000
commitd4e70391772e9b3fa25d96b93d50278ea1c125ef (patch)
tree8397c40eb0fbcd1e79470ce8389a29cbebc02ca6 /usr.bin/doscmd/signal.c
parent073b941095e3deeaae66ec3452643c4db25deb08 (diff)
downloadFreeBSD-src-d4e70391772e9b3fa25d96b93d50278ea1c125ef.zip
FreeBSD-src-d4e70391772e9b3fa25d96b93d50278ea1c125ef.tar.gz
Unbreak doscmd after the sigset_t change:
doscmd heavily depends on struct sigcontext which luckily is mostly passed between functions as usion regcontext_t. By redefining union regcontext_t in terms of mcontext_t almost all bases are covered. It also seems to me that doscmd was in a transitional state. The redundant definitions made it difficult to get a clear overview and could easily cause oversight. To make sure my changes were ok, I went as far as to complete the transition. It was not exactly necessary, but I expect to have to come back here some more ("whistle" if I'm wrong :-).
Diffstat (limited to 'usr.bin/doscmd/signal.c')
-rw-r--r--usr.bin/doscmd/signal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/doscmd/signal.c b/usr.bin/doscmd/signal.c
index 7041597..297bf37 100644
--- a/usr.bin/doscmd/signal.c
+++ b/usr.bin/doscmd/signal.c
@@ -66,9 +66,9 @@ sanity_check(struct sigframe *sf)
static void
generichandler(struct sigframe sf)
{
- if (sf.sf_siginfo.si_sc.sc_efl & PSL_VM) {
+ if (sf.sf_uc.uc_mcontext.mc_tf.tf_eflags & PSL_VM) {
saved_sigframe = &sf;
- saved_regcontext = (regcontext_t *)&(sf.sf_siginfo.si_sc);
+ saved_regcontext = (regcontext_t *)&(sf.sf_uc.uc_mcontext);
saved_valid = 1;
if (handler[sf.sf_signum])
(*handler[sf.sf_signum])(&sf);
OpenPOWER on IntegriCloud