Commit Diff

Commit:
8db40354c5ded13fac5974de4f7cc1b7f0087d67
From:
Russ Cox <rsc@swtch.com>
Via:
Russ Cox <rsc@google.com>
Date:
Message:
win: local \r cancellation Change-Id: I4becec052af58c5a52b777004867eb23023b9403 Reviewed-on: https://plan9port-review.googlesource.com/1391 Reviewed-by: Russ Cox <rsc@google.com>
Actions:
Patch | Tree
commit - 0d2dfbc84f42317fab5bc247355868d86613f3b0
commit + 8db40354c5ded13fac5974de4f7cc1b7f0087d67
blob - 97ef6d87dd1b2ac81fe9f93df59b26c120b89087
blob + 032f9ded0beccd88fba267a1a7c8be10214ada54
--- src/cmd/9term/win.c
+++ 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: