procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(decode_eol): While decoding DOS-like eol, handle a

Browse source 
single CR code correctly.
(shrink_decoding_region) <CODING_CATEGORY_IDX_ISO_7 or
CODING_CATEGORY_IDX_ISO_7_TIGHT>: Skip also 8-bit codes.
This commit is contained in:
Kenichi Handa 1998-09-25 07:32:05 +00:00
parent f695b4b18a
commit fdfcf19d01
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/coding.c
View file

@ -2529,18 +2529,20 @@ decode_eol (coding, source, destination, src_bytes, dst_bytes)
if (c == '\r')
{
ONE_MORE_BYTE (c);
if (c != '\n')
if (c == '\n')
*dst++ = c;
else
{
if (coding->mode & CODING_MODE_INHIBIT_INCONSISTENT_EOL)
{
result = CODING_FINISH_INCONSISTENT_EOL;
goto label_end_of_loop_2;
}
src--;
*dst++ = '\r';
if (BASE_LEADING_CODE_P (c))
coding->fake_multibyte = 1;
}
*dst++ = c;
}
else if (c == '\n'
&& (coding->mode & CODING_MODE_INHIBIT_INCONSISTENT_EOL))
@ -2562,9 +2564,23 @@ decode_eol (coding, source, destination, src_bytes, dst_bytes)
src = src_base;
break;
}
if (result == CODING_FINISH_NORMAL
&& src < src_end)
result = CODING_FINISH_INSUFFICIENT_DST;
if (src < src_end)
{
if (result == CODING_FINISH_NORMAL)
result = CODING_FINISH_INSUFFICIENT_DST;
else if (result != CODING_FINISH_INCONSISTENT_EOL
&& coding->mode & CODING_MODE_LAST_BLOCK)
{
/* This is the last block of the text to be decoded.
We flush out all remaining codes. */
src_bytes = src_end - src;
if (dst_bytes && (dst_end - dst < src_bytes))
src_bytes = dst_end - dst;
bcopy (src, dst, src_bytes);
dst += src_bytes;
src += src_bytes;
}
}
}
break;
@ -3926,11 +3942,11 @@ shrink_decoding_region (beg, end, coding, str)
the following 2-byte at the tail. */
if (eol_conversion)
while (begp < endp
&& (c = endp[-1]) < 0x80 && c != ISO_CODE_ESC && c != '\r')
&& (c = endp[-1]) != ISO_CODE_ESC && c != '\r')
endp--;
else
while (begp < endp
&& (c = endp[-1]) < 0x80 && c != ISO_CODE_ESC)
&& (c = endp[-1]) != ISO_CODE_ESC)
endp--;
/* Do not consider LF as ascii if preceded by CR, since that
confuses eol decoding. */