2002-04-15  Bruno Haible  <bruno@clisp.org>

	* iconvdata/sjis.c (halfkana_to_ucs4): Remove array.
	(BODY for FROM_LOOP): Optimize the JISX0201:GR to Unicode conversion.

2002-04-15  Bruno Haible  <bruno@clisp.org>

	* iconvdata/euc-jp.c (BODY for FROM_LOOP): When encountering an
	invalid input (e.g. a byte > 0x80 followed by a byte < 0x80), skip
	always one byte, not 0 bytes in some cases and 2 bytes in others.

	* iconvdata/tst-table-from.c (main): Correct the usage message.

2002-04-19  Isamu Hasegawa  <isamu@yamato.ibm.com>

	* posix/regcomp.c (parse_expression): Fix incorrect error code.
	(parse_dup_op): Fix error handling like "a{}".
	(parse_bracket_exp): Add error handling.
	(fetch_number): Add error handling for "a{<very_large_number>}".

2002-04-19  Isamu Hasegawa  <isamu@yamato.ibm.com>

	* posix/regcomp.c (parse_bracket_symbol): Add error handling
	in case that the symbol name is too long.
	(build_charclass): Handle [:lower:]/[:uppper:] correctly
	in case of REG_ICASE.
This commit is contained in:
Ulrich Drepper 2002-04-20 02:05:39 +00:00
parent 602c2f9d9d
commit e2806aaf5d
4 changed files with 40 additions and 21 deletions

View File

@ -1,3 +1,30 @@
2002-04-15 Bruno Haible <bruno@clisp.org>
* iconvdata/sjis.c (halfkana_to_ucs4): Remove array.
(BODY for FROM_LOOP): Optimize the JISX0201:GR to Unicode conversion.
2002-04-15 Bruno Haible <bruno@clisp.org>
* iconvdata/euc-jp.c (BODY for FROM_LOOP): When encountering an
invalid input (e.g. a byte > 0x80 followed by a byte < 0x80), skip
always one byte, not 0 bytes in some cases and 2 bytes in others.
* iconvdata/tst-table-from.c (main): Correct the usage message.
2002-04-19 Isamu Hasegawa <isamu@yamato.ibm.com>
* posix/regcomp.c (parse_expression): Fix incorrect error code.
(parse_dup_op): Fix error handling like "a{}".
(parse_bracket_exp): Add error handling.
(fetch_number): Add error handling for "a{<very_large_number>}".
2002-04-19 Isamu Hasegawa <isamu@yamato.ibm.com>
* posix/regcomp.c (parse_bracket_symbol): Add error handling
in case that the symbol name is too long.
(build_charclass): Handle [:lower:]/[:uppper:] correctly
in case of REG_ICASE.
2002-04-19 Andreas Jaeger <aj@suse.de>
* math/libm-test.inc: Fix comment, suggested by Hartvig Ekner

View File

@ -63,12 +63,12 @@
else \
{ \
/* Two or more byte character. First test whether the next \
character is also available. */ \
byte is also available. */ \
int ch2; \
\
if (__builtin_expect (inptr + 1 >= inend, 0)) \
{ \
/* The second character is not available. Store the \
/* The second byte is not available. Store the \
intermediate result. */ \
result = __GCONV_INCOMPLETE_INPUT; \
break; \
@ -104,6 +104,10 @@
result = __GCONV_ILLEGAL_INPUT; \
break; \
} \
\
++inptr; \
++*irreversible; \
continue; \
} \
\
inptr += 2; \
@ -143,7 +147,7 @@
break; \
} \
\
inptr += 2; \
++inptr; \
++*irreversible; \
continue; \
} \

View File

@ -1,5 +1,5 @@
/* Mapping tables for SJIS handling.
Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
Copyright (C) 1997-2001, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@ -22,18 +22,6 @@
#include <stdint.h>
#include <wchar.h>
static const uint32_t halfkana_to_ucs4[] =
{
0xff61, 0xff62, 0xff63, 0xff64, 0xff65, 0xff66, 0xff67, 0xff68,
0xff69, 0xff6a, 0xff6b, 0xff6c, 0xff6d, 0xff6e, 0xff6f, 0xff70,
0xff71, 0xff72, 0xff73, 0xff74, 0xff75, 0xff76, 0xff77, 0xff78,
0xff79, 0xff7a, 0xff7b, 0xff7c, 0xff7d, 0xff7e, 0xff7f, 0xff80,
0xff81, 0xff82, 0xff83, 0xff84, 0xff85, 0xff86, 0xff87, 0xff88,
0xff89, 0xff8a, 0xff8b, 0xff8c, 0xff8d, 0xff8e, 0xff8f, 0xff90,
0xff91, 0xff92, 0xff93, 0xff94, 0xff95, 0xff96, 0xff97, 0xff98,
0xff99, 0xff9a, 0xff9b, 0xff9c, 0xff9d, 0xff9e, 0xff9f
};
/* The following table can be generated from the file
unix/mappings/eastasia/jis/shiftjis.txt
@ -4357,7 +4345,7 @@ static const char from_ucs4_extra[0x100][2] =
++inptr; \
else if (ch >= 0xa1 && ch <= 0xdf) \
{ \
ch = halfkana_to_ucs4[ch - 0xa1]; \
ch += 0xfec0; \
++inptr; \
} \
else if (__builtin_expect (ch > 0xea, 0) \
@ -4378,14 +4366,14 @@ static const char from_ucs4_extra[0x100][2] =
} \
else \
{ \
/* Two-byte character. First test whether the next character \
/* Two-byte character. First test whether the next byte \
is also available. */ \
uint32_t ch2; \
uint_fast32_t idx; \
\
if (__builtin_expect (inptr + 1 >= inend, 0)) \
{ \
/* The second character is not available. Store \
/* The second byte is not available. Store \
the intermediate result. */ \
result = __GCONV_INCOMPLETE_INPUT; \
break; \

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000-2001 Free Software Foundation, Inc.
/* Copyright (C) 2000-2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Bruno Haible <haible@clisp.cons.org>, 2000.
@ -184,7 +184,7 @@ main (int argc, char *argv[])
if (argc != 2)
{
fprintf (stderr, "Usage: tst-table-to charset\n");
fprintf (stderr, "Usage: tst-table-from charset\n");
exit (1);
}
charset = argv[1];