summaryrefslogtreecommitdiffstats
path: root/gettext-tools
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2003-05-12 09:45:47 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:10:28 +0200
commitc1b9ee525b71d204da5e2f7a186b355847e229e5 (patch)
treeac08a41177ba9d1c7e9bae26ce2a92a32db296c7 /gettext-tools
parent5ae75d07d2e58eedc512fa45bcc9a166d9b03c11 (diff)
downloadexternal_gettext-c1b9ee525b71d204da5e2f7a186b355847e229e5.zip
external_gettext-c1b9ee525b71d204da5e2f7a186b355847e229e5.tar.gz
external_gettext-c1b9ee525b71d204da5e2f7a186b355847e229e5.tar.bz2
Avoid an unjustified "conversion error" on long strings.
Diffstat (limited to 'gettext-tools')
-rw-r--r--gettext-tools/src/ChangeLog6
-rw-r--r--gettext-tools/src/msgl-iconv.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index ced807b..38e7343 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-10 Bruno Haible <bruno@clisp.org>
+
+ * msgl-iconv.c (iconv_string): Don't return -1 just because the string
+ is longer than 4 KB.
+ Reported by Denis Barbier <barbier@linuxfr.org>.
+
2003-05-04 Bruno Haible <bruno@clisp.org>
* po-lex.h (po_gram_error): Don't use ISO C 99 feature on DEC C.
diff --git a/gettext-tools/src/msgl-iconv.c b/gettext-tools/src/msgl-iconv.c
index 1bebd61..e32c6bf 100644
--- a/gettext-tools/src/msgl-iconv.c
+++ b/gettext-tools/src/msgl-iconv.c
@@ -84,7 +84,9 @@ iconv_string (iconv_t cd, const char *start, const char *end,
if (res == (size_t)(-1))
{
- if (errno == EINVAL)
+ if (errno == E2BIG)
+ ;
+ else if (errno == EINVAL)
break;
else
return -1;