- size_t insize = len;
- size_t outsize = MAXGEDCLINELEN * 2;
- char *wrptr = int_buf;
- char *rdptr = str;
- memset(int_buf, 0, sizeof(int_buf));
- iconv(cd_to_internal, &rdptr, &insize, &wrptr, &outsize);
- return int_buf;
+ size_t outsize = out_len;
+ char *wrptr = output_buffer;
+ char *rdptr = conv_buf;
+ /* set up input buffer (concatenate to what was left previous time) */
+ /* can't use strcpy, because possible null bytes from unicode */
+ memcpy(conv_buf + conv_buf_size, str, len);
+ conv_buf_size += len;
+ /* set up output buffer (empty it) */
+ memset(output_buffer, 0, out_len);
+ /* do the conversion */
+ iconv(cd_to_internal, &rdptr, &conv_buf_size, &wrptr, &outsize);
+ /* then shift what is left over to the head of the input buffer */
+ memmove(conv_buf, rdptr, conv_buf_size);
+ memset(conv_buf + conv_buf_size, 0, sizeof(conv_buf) - conv_buf_size);
+ return output_buffer;