From 8db40354c5ded13fac5974de4f7cc1b7f0087d67 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Tue, 10 Nov 2015 10:33:12 -0500
Subject: win: local \r cancellation

Change-Id: I4becec052af58c5a52b777004867eb23023b9403
Reviewed-on: https://plan9port-review.googlesource.com/1391
Reviewed-by: Russ Cox <rsc@google.com>
---
 src/cmd/9term/win.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/cmd/9term/win.c b/src/cmd/9term/win.c
index 97ef6d87..032f9ded 100644
--- a/src/cmd/9term/win.c
+++ b/src/cmd/9term/win.c
@@ -483,7 +483,7 @@ int
 dropcr(char *p, int n)
 {
 	int i;
-	char *w, *r;
+	char *w, *r, *q;
 	
 	r = p;
 	w = p;
@@ -494,6 +494,19 @@ dropcr(char *p, int n)
 				w--;
 			break;
 		case '\r':
+			while(i<n-1 && *(r+1) == '\r') {
+				r++;
+				i++;
+			}
+			if(i<n && *(r+1) != '\n') {
+				q = r;
+				while(q>p && *(q-1) != '\n')
+					q--;
+				if(q > p) {
+					w = q;
+					break;
+				}
+			}
 			*w++ = '\n';
 			break;
 		default:
-- 
cgit v1.2.3