(str_cd_iconv): Use the first algorithm if iconv is not from GNU libiconv or

GNU libc. Otherwise we may miss a conversion failure.

diff --git a/ChangeLog b/ChangeLog
index 8625d6babba528b0eac4fb6d27bc00005a23ac73..1e0ca0d3892b84341aaeae7c669e11c864dba769 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-15  Bruno Haible  <bruno@clisp.org>
+
+       * lib/striconv.c (str_cd_iconv): Use the first algorithm if iconv is
+       not from GNU libiconv or GNU libc.
+
 2007-01-15  Bruno Haible  <bruno@clisp.org>
 
        * doc/gnulib-intro.texi (Copyright): Explain the different license

diff --git a/lib/striconv.c b/lib/striconv.c
index 3e5782dcaaed9639cb969786bf88d6b78b7bbce2..731a148ca6f7fa6b700e75185d9a4b1d00a11b83 100644 (file)
--- a/lib/striconv.c
+++ b/lib/striconv.c
@@ -192,7 +192,14 @@ str_cd_iconv (const char *src, iconv_t cd)
      to a trailing NUL byte in the output.  But not for UTF-7.  So that this
      function is usable for UTF-7, we have to exclude the NUL byte from the
      conversion and add it by hand afterwards.  */
-# if PROBABLY_SLOWER
+# 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.  For other iconv() implementations,
+     we have to look at the number of irreversible conversions returned;
+     but this information is lost when iconv() returns for an E2BIG reason.
+     Therefore we cannot use the second, faster algorithm.  */
 
   char *result = NULL;
   size_t length;
@@ -225,7 +232,10 @@ str_cd_iconv (const char *src, iconv_t cd)
   return final_result;
 
 # else
-
+  /* This algorithm is likely faster than the one above.  But it may produce
+     iconv() returns for an E2BIG reason, when the output size guess is too
+     small.  Therefore it can only be used when we don't need the number of
+     irreversible conversions performed.  */
   char *result;
   size_t result_size;
   size_t length;
@@ -299,17 +309,6 @@ str_cd_iconv (const char *src, iconv_t cd)
            else
              goto failed;
          }
-# 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;
-           goto failed;
-         }
-# endif
        else
          break;
       }