diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-02-26 20:48:56 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-02-26 20:48:56 +0200 |
| commit | 9322ab27e20be82722b2db73f74447f2b35c6502 (patch) | |
| tree | 41150ce4a24f6bd8843b900dbe17674eea1f5246 /awkgram.y | |
| parent | 64c5b3da1b7ebe73fcfb4edd9450382ccf1159fb (diff) | |
| parent | 33c16c16e6d33118075b196e16b33b342ee462d3 (diff) | |
| download | egawk-9322ab27e20be82722b2db73f74447f2b35c6502.tar.gz egawk-9322ab27e20be82722b2db73f74447f2b35c6502.tar.bz2 egawk-9322ab27e20be82722b2db73f74447f2b35c6502.zip | |
Merge branch 'master' into non-fatal-io-2
Diffstat (limited to 'awkgram.y')
| -rw-r--r-- | awkgram.y | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -3260,7 +3260,10 @@ yylex(void) pushback(); yyerror(_("unterminated regexp ends with `\\' at end of file")); goto end_regexp; /* kludge */ - } else if (c == '\n') { + } + if (c == '\r') /* allow MS-DOS files. bleah */ + c = nextc(true); + if (c == '\n') { sourceline++; continue; } else { @@ -3609,6 +3612,8 @@ retry: if ((gawk_mb_cur_max == 1 || nextc_is_1stbyte) && c == '\\') { c = nextc(true); + if (c == '\r') /* allow MS-DOS files. bleah */ + c = nextc(true); if (c == '\n') { sourceline++; continue; |