diff options
Diffstat (limited to 'iconvdata/iso8859-1.c')
| -rw-r--r-- | iconvdata/iso8859-1.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/iconvdata/iso8859-1.c b/iconvdata/iso8859-1.c index 06eeda5664..4949991711 100644 --- a/iconvdata/iso8859-1.c +++ b/iconvdata/iso8859-1.c @@ -1,5 +1,5 @@ /* Conversion to and from ISO 8859-1. - Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -48,10 +48,16 @@ if (ch > 0xff) \ { \ /* We have an illegal character. */ \ - result = __GCONV_ILLEGAL_INPUT; \ - break; \ + if (! ignore_errors_p ()) \ + { \ + result = __GCONV_ILLEGAL_INPUT; \ + break; \ + } \ + \ + ++*converted; \ } \ - *outptr++ = (unsigned char) ch; \ + else \ + *outptr++ = (unsigned char) ch; \ inptr += 4; \ } #include <iconv/loop.c> |