win: local \r cancellation
Change-Id: I4becec052af58c5a52b777004867eb23023b9403
Reviewed-on: https://plan9port-review.googlesource.com/1391
Reviewed-by: Russ Cox <rsc@google.com>
diff --git a/src/cmd/9term/win.c b/src/cmd/9term/win.c
index 97ef6d8..032f9de 100644
--- a/src/cmd/9term/win.c
+++ b/src/cmd/9term/win.c
@@ -483,7 +483,7 @@
dropcr(char *p, int n)
{
int i;
- char *w, *r;
+ char *w, *r, *q;
r = p;
w = p;
@@ -494,6 +494,19 @@
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:
