From 34a499dfe9f70d780c7193843812d667703a3783 Mon Sep 17 00:00:00 2001 From: jhb Date: Wed, 14 May 2003 15:01:20 +0000 Subject: [PATCH] s/procsig/sigacts/ to catch up to procsig and sigacts changes in the kernel. Approved by: re (scottl) --- lib/libkvm/kvm_proc.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c index b441fca159d2..efcb9326d523 100644 --- a/lib/libkvm/kvm_proc.c +++ b/lib/libkvm/kvm_proc.c @@ -100,9 +100,7 @@ kvm_proclist(kd, what, arg, p, bp, maxcnt) struct session sess; struct tty tty; struct vmspace vmspace; -#ifdef BAD_JHB_NO_COOKIE - struct procsig procsig; -#endif + struct sigacts sigacts; struct pstats pstats; struct ucred ucred; struct thread mtd; @@ -194,17 +192,15 @@ kvm_proclist(kd, what, arg, p, bp, maxcnt) kp->ki_textvp = proc.p_textvp; kp->ki_fd = proc.p_fd; kp->ki_vmspace = proc.p_vmspace; -#ifdef BAD_JHB_NO_COOKIE - if (proc.p_procsig != NULL) { - if (KREAD(kd, (u_long)proc.p_procsig, &procsig)) { + if (proc.p_sigacts != NULL) { + if (KREAD(kd, (u_long)proc.p_sigacts, &sigacts)) { _kvm_err(kd, kd->program, - "can't read procsig at %x", proc.p_procsig); + "can't read sigacts at %x", proc.p_sigacts); return (-1); } - kp->ki_sigignore = procsig.ps_sigignore; - kp->ki_sigcatch = procsig.ps_sigcatch; + kp->ki_sigignore = sigacts.ps_sigignore; + kp->ki_sigcatch = sigacts.ps_sigcatch; } -#endif if ((proc.p_sflag & PS_INMEM) && proc.p_stats != NULL) { if (KREAD(kd, (u_long)proc.p_stats, &pstats)) { _kvm_err(kd, kd->program,