level2: fix build errors from previous changes

diff --git a/Kernel/include/level2.h b/Kernel/include/level2.h
index 604605f..933169f 100644 (file)
--- a/Kernel/include/level2.h
+++ b/Kernel/include/level2.h
@@ -27,8 +27,8 @@ struct rlimit {
 struct tty;
 
 extern int in_group(uint16_t gid);
-extern uint8_t jobcontrol_in(uint8_t minor, struct tty *tty, usize_t *nread);
-extern uint8_t jobcontrol_out(uint8_t minor, struct tty *tty, usize_t *written);
+extern uint8_t jobcontrol_in(uint8_t minor, struct tty *tty);
+extern uint8_t jobcontrol_out(uint8_t minor, struct tty *tty);
 extern uint8_t jobcontrol_ioctl(uint8_t minor, struct tty *tty, uarg_t request);
 extern int tcsetpgrp(struct tty *tty, char *data);
 

diff --git a/Kernel/level2.c b/Kernel/level2.c
index bfe3071..eb32d66 100644 (file)
--- a/Kernel/level2.c
+++ b/Kernel/level2.c
@@ -57,7 +57,7 @@ static uint8_t jobop(uint8_t minor, uint8_t sig, struct tty *t, uint8_t ign)
                kprintf("[stop %d %d %d]\n",
                        t->pgrp, udata.u_ptab->p_pgrp, udata.u_ptab->p_tty);
 #endif
-               if ((udata.u_ptab->p_held & sigmask(sig)) || udata.u_sigvec[sig] == SIG_IGN)
+               if ((udata.u_ptab->p_sig[1].s_held & sigmask(sig)) || udata.u_sigvec[sig] == SIG_IGN)
                        ignored = 1;
 
                if ((ignored && ign) || orphan_pgrp(p->p_pgrp, p->p_session)) {