Work around a bug in glibc-2.1 iconv.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 7648b962d309bfb9bb0e9aa91181935d510dbdbe..de7bc491a8d5f0057dff1a624576de71b682202c 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-10  Bruno Haible  <haible@clisp.cons.org>
 
+       * linebreak.c (iconv_string_length): Don't call
+       iconv(cd,NULL,NULL,NULL,NULL) on glibc-2.1; it crashes.
+
        * localcharset.c (locale_charset): Allow wildcard syntax. Resolve
        alias also if codeset is empty.
        * config.charset (BeOS): Use wildcard syntax.

diff --git a/lib/linebreak.c b/lib/linebreak.c
index bd15abf18bac9ee4be7a0550877bc1976fe78597..90879ac8a8e8ae466a7895bde2fa9dc948e10310 100644 (file)
--- a/lib/linebreak.c
+++ b/lib/linebreak.c
@@ -1587,9 +1587,9 @@ iconv_string_length (cd, s, n)
       return (size_t)(-1);
     count += outptr - tmpbuf;
   }
-#endif
-  /* return to the initial state */
+  /* Return to the initial state.  */
   iconv (cd, NULL, NULL, NULL, NULL);
+#endif
   return count;
 #undef TMPBUFSIZE
 }