diff options
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c index 328431a07b..c3aef90a11 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1333,10 +1333,19 @@ retry: * If there is conversion error or not enough room try using * another conversion. */ - if ((iconv(iconv_fd, (void *)&fromp, &from_size, &top, &to_size) + while ((iconv(iconv_fd, (void *)&fromp, &from_size, + &top, &to_size) == (size_t)-1 && ICONV_ERRNO != ICONV_EINVAL) || from_size > CONV_RESTLEN) - goto rewind_retry; + { + if (!keep_dest_enc) + goto rewind_retry; + /* Ignore a byte and try again. */ + ++fromp; + --from_size; + *top++ = '?'; + --to_size; + } if (from_size > 0) { |