From: tholo <tholo@openbsd.org>
Date: Tue, 17 Dec 1996 19:19:33 +0000 (+0000)
Subject: Fix oversight in column handling with OCRNL enabled
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=649771711b0bb5ce63d0b5b06550cacc7c86d7a9;p=openbsd

Fix oversight in column handling with OCRNL enabled
---

diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 7d089df71a2..4b5cfbd734a 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty.c,v 1.22 1996/12/17 19:15:24 tholo Exp $	*/
+/*	$OpenBSD: tty.c,v 1.23 1996/12/17 19:19:33 tholo Exp $	*/
 /*	$NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $	*/
 
 /*-
@@ -693,7 +693,7 @@ ttyoutput(c, tp)
 	case CONTROL:
 		break;
 	case NEWLINE:
-		if (ISSET(tp->t_oflag, ONLRET))
+		if (ISSET(tp->t_oflag, ONLRET) || ISSET(tp->t_oflag, OCRNL))
 			col = 0;
 		break;
 	case RETURN: