From: Guido van Rossum <guido@python.org>
Date: Wed, 14 Jun 1995 18:26:02 +0000 (+0000)
Subject: replace "\r\n" with "\n" at line end (Jim Ahlstrom)
X-Git-Tag: v1.3b1~289
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e96eb9266e4ed47d125998287bbca492335e766;p=thirdparty%2FPython%2Fcpython.git

replace "\r\n" with "\n" at line end (Jim Ahlstrom)
---

diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index 083ef0e9a2e7..4d759d1cd978 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -235,6 +235,7 @@ tok_nextc(tok)
 		else {
 			int done = 0;
 			int cur = 0;
+			char *pt;
 			if (tok->start == NULL) {
 				if (tok->buf == NULL) {
 					tok->buf = NEW(char, BUFSIZ);
@@ -295,6 +296,13 @@ tok_nextc(tok)
 				done = tok->inp[-1] == '\n';
 			}
 			tok->cur = tok->buf + cur;
+			/* replace "\r\n" with "\n" */
+			pt = tok->inp - 2;
+			if (pt >= tok->buf && *pt == '\r') {
+				*pt++ = '\n';
+				*pt = '\0';
+				tok->inp = pt;
+			}
 		}
 		if (tok->done != E_OK) {
 			if (tok->prompt != NULL)