mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-20 20:50:53 -08:00
Code Issues Projects Releases Wiki Activity

(decode_coding_emacs_mule): If coding->eol_type is CR

Browse source 
or CRLF, decode EOLs.
This commit is contained in:
Eli Zaretskii 2000-10-24 09:04:35 +00:00
parent 333526e0f4
commit 4af310dbf1
1 changed files with 40 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/coding.c
View file

@ -614,7 +614,45 @@ decode_coding_emacs_mule (coding, source, destination, src_bytes, dst_bytes)
unsigned char tmp[MAX_MULTIBYTE_LENGTH], *p;
int bytes;
if (UNIBYTE_STR_AS_MULTIBYTE_P (src, src_end - src, bytes))
if (*src == '\r')
{
int c;
src++;
if (coding->eol_type == CODING_EOL_CR)
c = '\n';
else if (coding->eol_type == CODING_EOL_CRLF)
{
ONE_MORE_BYTE (c);
if (c != '\n')
{
if (coding->mode & CODING_MODE_INHIBIT_INCONSISTENT_EOL)
{
coding->result = CODING_FINISH_INCONSISTENT_EOL;
goto label_end_of_loop;
}
src--;
c = '\r';
}
}
*dst++ = c;
coding->produced_char++;
continue;
}
else if (*src == '\n')
{
if ((coding->eol_type == CODING_EOL_CR
|| coding->eol_type == CODING_EOL_CRLF)
&& coding->mode & CODING_MODE_INHIBIT_INCONSISTENT_EOL)
{
coding->result = CODING_FINISH_INCONSISTENT_EOL;
goto label_end_of_loop;
}
*dst++ = *src++;
coding->produced_char++;
continue;
}
else if (UNIBYTE_STR_AS_MULTIBYTE_P (src, src_end - src, bytes))
{
p = src;
src += bytes;
@ -633,6 +671,7 @@ decode_coding_emacs_mule (coding, source, destination, src_bytes, dst_bytes)
while (bytes--) *dst++ = *p++;
coding->produced_char++;
}
label_end_of_loop:
coding->consumed = coding->consumed_char = src_base - source;
coding->produced = dst - destination;
}