Replace FSF snail mail address with URLs.

[thirdparty/glibc.git] / iconvdata / 8bit-gap.c

diff --git a/iconvdata/8bit-gap.c b/iconvdata/8bit-gap.c
index 7caa5427d5094d71a5e5528912714f71e3f56986..d2e4efc2b7ee9c4a28cf8e9e25e5dcf975724fa6 100644 (file)
--- a/iconvdata/8bit-gap.c
+++ b/iconvdata/8bit-gap.c
@@ -1,23 +1,22 @@
 /* Generic conversion to and from 8bit charsets,
    converting from UCS using gaps.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-1999, 2000-2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <dlfcn.h>
 #include <stdint.h>
@@ -32,6 +31,10 @@ struct gap
 /* Now we can include the tables.  */
 #include TABLES
 
+#ifndef NONNUL
+# define NONNUL(c)     ((c) != '\0')
+#endif
+
 
 #define FROM_LOOP              from_gap
 #define TO_LOOP                        to_gap
@@ -49,16 +52,10 @@ struct gap
   {                                                                          \
     uint32_t ch = to_ucs4[*inptr];                                           \
                                                                              \
-    if (HAS_HOLES && __builtin_expect (ch, L'\1') == L'\0' && *inptr != '\0') \
+    if (HAS_HOLES && __builtin_expect (ch == L'\0', 0) && NONNUL (*inptr))    \
       {                                                                              \
        /* This is an illegal character.  */                                  \
-       if (! ignore_errors_p ())                                             \
-         {                                                                   \
-           result = __GCONV_ILLEGAL_INPUT;                                   \
-           break;                                                            \
-         }                                                                   \
-                                                                             \
-       ++*irreversible;                                                      \
+       STANDARD_FROM_LOOP_ERR_HANDLER (1);                                   \
       }                                                                              \
     else                                                                     \
       {                                                                              \
@@ -69,6 +66,15 @@ struct gap
     ++inptr;                                                                 \
   }
 #define LOOP_NEED_FLAGS
+#define ONEBYTE_BODY \
+  {                                                                          \
+    uint32_t ch = to_ucs4[c];                                                \
+                                                                             \
+    if (HAS_HOLES && __builtin_expect (ch == L'\0', 0) && NONNUL (c))        \
+      return WEOF;                                                           \
+    else                                                                     \
+      return ch;                                                             \
+  }
 #include <iconv/loop.c>
 
 
@@ -82,8 +88,11 @@ struct gap
     uint32_t ch = get32 (inptr);                                             \
     unsigned char res;                                                       \
                                                                              \
-    if (__builtin_expect (ch, 0) >= 0xffff)                                  \
-      rp = NULL;                                                             \
+    if (__builtin_expect (ch >= 0xffff, 0))                                  \
+      {                                                                              \
+       UNICODE_TAG_HANDLER (ch, 4);                                          \
+       rp = NULL;                                                            \
+      }                                                                              \
     else                                                                     \
       while (ch > rp->end)                                                   \
        ++rp;                                                                 \
@@ -93,7 +102,7 @@ struct gap
            __builtin_expect (res, '\1') == '\0' && ch != 0))                 \
       {                                                                              \
        /* This is an illegal character.  */                                  \
-       STANDARD_ERR_HANDLER (4);                                             \
+       STANDARD_TO_LOOP_ERR_HANDLER (4);                                     \
       }                                                                              \
                                                                              \
     *outptr++ = res;                                                         \