Treat NetBSD iconv like IRIX iconv.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 5225b8ff16835eea65f7c541b20c2bb59f31319f..6afa1869faded3d3c85de4843d7d67d1c56d8f9c 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-17  Bruno Haible  <bruno@clisp.org>
+
+       * iconvstring.c (iconv_string): Recognize conversion failures also
+       from NetBSD's iconv().
+
 2006-06-17  Bruno Haible  <bruno@clisp.org>
 
        * config.charset: Update for NetBSD 3.0.

diff --git a/gettext-tools/lib/iconvstring.c b/gettext-tools/lib/iconvstring.c
index cd0d9af6300c29bc7a5219a54c285598376d2b97..ece5e26a0ae46a18f16fc9c9e1949fd1b86ff0a6 100644 (file)
--- a/gettext-tools/lib/iconvstring.c
+++ b/gettext-tools/lib/iconvstring.c
@@ -76,8 +76,9 @@ iconv_string (iconv_t cd, const char *start, const char *end,
            else
              return -1;
          }
-# if !defined _LIBICONV_VERSION && (defined sgi || defined __sgi)
-       /* Irix iconv() inserts a NUL byte if it cannot convert.  */
+# if !defined _LIBICONV_VERSION && (defined sgi || defined __sgi || defined __NetBSD__)
+       /* Irix iconv() inserts a NUL byte if it cannot convert.
+          NetBSD iconv() inserts a '?' byte if it cannot convert.  */
        else if (res > 0)
          return -1;
 # endif
@@ -131,8 +132,9 @@ iconv_string (iconv_t cd, const char *start, const char *end,
            else
              return -1;
          }
-# if !defined _LIBICONV_VERSION && (defined sgi || defined __sgi)
-       /* Irix iconv() inserts a NUL byte if it cannot convert.  */
+# if !defined _LIBICONV_VERSION && (defined sgi || defined __sgi || defined __NetBSD__)
+       /* Irix iconv() inserts a NUL byte if it cannot convert.
+          NetBSD iconv() inserts a '?' byte if it cannot convert.  */
        else if (res > 0)
          return -1;
 # endif