patch-2.1.57 linux/drivers/char/tty_ioctl.c

• Lines: 27
• Date: Sat Sep 20 14:51:54 1997
• Orig file: v2.1.56/linux/drivers/char/tty_ioctl.c
• Orig date: Thu Aug 14 20:49:16 1997

diff -u --recursive --new-file v2.1.56/linux/drivers/char/tty_ioctl.c linux/drivers/char/tty_ioctl.c
@@ -60,7 +60,7 @@
 		printk("waiting %s...(%d)\n", tty_name(tty), tty->driver.chars_in_buffer(tty));
 #endif
 		current->state = TASK_INTERRUPTIBLE;
-		if (current->signal & ~current->blocked)
+		if (signal_pending(current))
 			goto stop_waiting;
 		if (!tty->driver.chars_in_buffer(tty))
 			break;
@@ -170,7 +170,7 @@
 
 	if (opt & TERMIOS_WAIT) {
 		tty_wait_until_sent(tty, 0);
-		if (current->signal & ~current->blocked)
+		if (signal_pending(current))
 			return -EINTR;
 	}
 
@@ -516,7 +516,7 @@
 			if (retval)
 				return retval;
 			tty_wait_until_sent(tty, 0);
-			if (current->signal & ~current->blocked)
+			if (signal_pending(current))
 				return -EINTR;
 			if (!tty->driver.ioctl)
 				return 0;