Treat all non-GNU iconv implementations like Irix iconv.

diff --git a/ChangeLog b/ChangeLog
index b6380bbecc2fbc99de530b94e37428660402ed88..58f53df650f68e4b4053259386d85b28dc100026 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-24  Bruno Haible  <bruno@clisp.org>
+
+       * lib/striconv.c (mem_cd_iconv, str_cd_iconv): Treat all non-GNU
+       iconv implementations like Irix iconv.
+
 2006-10-24  Paul Eggert  <eggert@cs.ucla.edu>
 
        * modules/vararrays: New file.

diff --git a/lib/striconv.c b/lib/striconv.c
index c97d5a0c1c74f580d54d9568ae0d9e865193b2ee..fc02249356edb5597f866af3ef74b1de4f805be0 100644 (file)
--- a/lib/striconv.c
+++ b/lib/striconv.c
@@ -80,8 +80,11 @@ mem_cd_iconv (const char *src, size_t srclen, iconv_t cd,
            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 __GLIBC__
+       /* Irix iconv() inserts a NUL byte if it cannot convert.
+          NetBSD iconv() inserts a question mark if it cannot convert.
+          Only GNU libiconv and GNU libc are known to prefer to fail rather
+          than doing a lossy conversion.  */
        else if (res > 0)
          {
            errno = EILSEQ;
@@ -147,8 +150,11 @@ mem_cd_iconv (const char *src, size_t srclen, iconv_t cd,
            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 __GLIBC__
+       /* Irix iconv() inserts a NUL byte if it cannot convert.
+          NetBSD iconv() inserts a question mark if it cannot convert.
+          Only GNU libiconv and GNU libc are known to prefer to fail rather
+          than doing a lossy conversion.  */
        else if (res > 0)
          {
            errno = EILSEQ;
@@ -288,8 +294,11 @@ str_cd_iconv (const char *src, iconv_t cd)
            else
              goto failed;
          }
-# if !defined _LIBICONV_VERSION && (defined sgi || defined __sgi)
-       /* Irix iconv() inserts a NUL byte if it cannot convert.  */
+# if !defined _LIBICONV_VERSION && !defined __GLIBC__
+       /* Irix iconv() inserts a NUL byte if it cannot convert.
+          NetBSD iconv() inserts a question mark if it cannot convert.
+          Only GNU libiconv and GNU libc are known to prefer to fail rather
+          than doing a lossy conversion.  */
        else if (res > 0)
          {
            errno = EILSEQ;