patch 7.4.2144
Problem: On MS-Windows quickix does not handle a line with 1023 bytes
ending in CR-LF properly.
Solution: Don't consider CR a line break. (Ken Takata)
diff --git a/src/quickfix.c b/src/quickfix.c
index b607170..aa94ae6 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -651,11 +651,7 @@
discard = FALSE;
state->linelen = (int)STRLEN(IObuff);
- if (state->linelen == IOSIZE - 1 && !(IObuff[state->linelen - 1] == '\n'
-#ifdef USE_CRNL
- || IObuff[state->linelen - 1] == '\r'
-#endif
- ))
+ if (state->linelen == IOSIZE - 1 && !(IObuff[state->linelen - 1] == '\n'))
{
/*
* The current line exceeds IObuff, continue reading using
@@ -680,11 +676,7 @@
break;
state->linelen = (int)STRLEN(state->growbuf + growbuflen);
growbuflen += state->linelen;
- if ((state->growbuf)[growbuflen - 1] == '\n'
-#ifdef USE_CRNL
- || (state->growbuf)[growbuflen - 1] == '\r'
-#endif
- )
+ if ((state->growbuf)[growbuflen - 1] == '\n')
break;
if (state->growbufsiz == LINE_MAXLEN)
{
@@ -708,11 +700,7 @@
*/
if (fgets((char *)IObuff, IOSIZE, state->fd) == NULL
|| (int)STRLEN(IObuff) < IOSIZE - 1
- || IObuff[IOSIZE - 1] == '\n'
-#ifdef USE_CRNL
- || IObuff[IOSIZE - 1] == '\r'
-#endif
- )
+ || IObuff[IOSIZE - 1] == '\n')
break;
}
@@ -757,11 +745,13 @@
/* remove newline/CR from the line */
if (state->linelen > 0 && state->linebuf[state->linelen - 1] == '\n')
+ {
state->linebuf[state->linelen - 1] = NUL;
#ifdef USE_CRNL
- if (state->linelen > 0 && state->linebuf[state->linelen - 1] == '\r')
- state->linebuf[state->linelen - 1] = NUL;
+ if (state->linelen > 1 && state->linebuf[state->linelen - 2] == '\r')
+ state->linebuf[state->linelen - 2] = NUL;
#endif
+ }
#ifdef FEAT_MBYTE
remove_bom(state->linebuf);
diff --git a/src/version.c b/src/version.c
index 1c7d2c3..a6f1794 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2144,
+/**/
2143,
/**/
2142,
