From a7cde2b98a658522f552a7ac7ae0a9ef07981e0a Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 17 Jan 2001 14:57:09 +0000 Subject: * autoload.cc (LoadDLLinitfunc): Remove debugging statement. * exceptions.cc (sig_handle_tty_stop): Move setting of PID_STOPPED to earlier in interrupt. ((interrupt_setup): i.e., here. (sig_handle): Don't queue multiple SIGSTOPS. * fhandler.h (bg_check_types): Enumerate return value of bg_check for clarity. * signal.cc (kill_pgrp): Minor cleanup. * fhandler_termios.cc (fhandler_termios::bg_check): Use enumerated type for function return. Don't raise signal if a signal is already queued. * fhandler_console.cc (fhandler_console::read): Use enumerated return type for bg_check. * select.cc: Ditto, throughout. * read.cc: Ditto, throughout. * termios.cc: Ditto, throughout. (_read): YA interrupt detect simplification. * wait.cc (wait4): Ditto. --- winsup/cygwin/signal.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'winsup/cygwin/signal.cc') diff --git a/winsup/cygwin/signal.cc b/winsup/cygwin/signal.cc index 23bc9f470..c90ae6abb 100644 --- a/winsup/cygwin/signal.cc +++ b/winsup/cygwin/signal.cc @@ -213,11 +213,9 @@ kill_pgrp (pid_t pid, int sig) continue; /* Is it a process we want to kill? */ - if (pid == 0 && (p->pgid != myself->pgid || p->ctty != myself->ctty)) - continue; - if (pid > 1 && p->pgid != pid) - continue; - if (sig < 0 && NOTSTATE(p, PID_STOPPED)) + if ((pid == 0 && (p->pgid != myself->pgid || p->ctty != myself->ctty)) || + (pid > 1 && p->pgid != pid) || + (sig < 0 && NOTSTATE(p, PID_STOPPED))) continue; sigproc_printf ("killing pid %d, pgrp %d, p->ctty %d, myself->ctty %d", p->pid, p->pgid, p->ctty, myself->ctty); -- cgit v1.2.3