patch-1.3.96 linux/drivers/char/pty.c

• Lines: 30
• Date: Fri Apr 26 09:23:24 1996
• Orig file: v1.3.95/linux/drivers/char/pty.c
• Orig date: Wed Apr 24 17:00:38 1996

diff -u --recursive --new-file v1.3.95/linux/drivers/char/pty.c linux/drivers/char/pty.c
@@ -216,8 +216,9 @@
 	 */
 	if (tty->driver.subtype == PTY_TYPE_MASTER)
 		return 0;
-	add_wait_queue(&pty->open_wait, &wait);
 	retval = 0;
+#if PTY_SLAVE_WAITS_ON_OPEN
+	add_wait_queue(&pty->open_wait, &wait);
 	while (1) {
 		if (current->signal & ~current->blocked) {
 			retval = -ERESTARTSYS;
@@ -226,6 +227,7 @@
 		/*
 		 * Block until the master is open...
 		 */
+		current->state = TASK_INTERRUPTIBLE;
 		if (tty->link->count &&
 		    !test_bit(TTY_OTHER_CLOSED, &tty->flags))
 			break;
@@ -233,6 +235,10 @@
 	}
 	current->state = TASK_RUNNING;
 	remove_wait_queue(&pty->open_wait, &wait);
+#else
+	if (!tty->link->count || test_bit(TTY_OTHER_CLOSED, &tty->flags))
+		retval = -EPERM;
+#endif
 	return retval;
 }