Avoid a failure on strings longer than 4 KB.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index d7cea73a82e910b08270c28a3f1f35a0736016ed..70951b461029aee2d6c6171e104b63dcc3323101 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-10  Bruno Haible  <bruno@clisp.org>
+
+       * linebreak.c (iconv_string_length): Don't return -1 just because the
+       string is longer than 4 KB.
+
 2003-05-12  Jim Meyering  <jim@meyering.net>
 
        * strftime.c (my_strftime): Let the `-' (no-pad) flag affect

diff --git a/lib/linebreak.c b/lib/linebreak.c
index 2274d160ae6da17a21966f4dc765d2ef5f3f525c..c0ae08281718d2ff4b650a47bf4b79fc40a060ef 100644 (file)
--- a/lib/linebreak.c
+++ b/lib/linebreak.c
@@ -1379,7 +1379,7 @@ iconv_string_length (iconv_t cd, const char *s, size_t n)
       char *outptr = tmpbuf;
       size_t outsize = TMPBUFSIZE;
       size_t res = iconv (cd, (ICONV_CONST char **) &inptr, &insize, &outptr, &outsize);
-      if (res == (size_t)(-1))
+      if (res == (size_t)(-1) && errno != E2BIG)
         return (size_t)(-1);
       count += outptr - tmpbuf;
     }