From: "René Scharfe" <l.s.r@web•de>
To: "Torsten Bögershausen" <tboegi@web•de>
Cc: Git List <git@vger•kernel.org>
Subject: Re: t3900 failure on macOS, iconv(3) broken?
Date: Tue, 9 Dec 2025 20:35:23 +0100 [thread overview]
Message-ID: <51dc4ca7-61fd-42f7-8e72-a516a870e011@web.de> (raw)
In-Reply-To: <20251209163356.GA5762@tb-raspi4>
On 12/9/25 5:33 PM, Torsten Bögershausen wrote:
> On Mon, Dec 08, 2025 at 11:59:11PM +0100, René Scharfe wrote:
>>
>> diff --git a/utf8.c b/utf8.c
>> index 35a0251939..ff0c541fbc 100644
>> --- a/utf8.c
>> +++ b/utf8.c
>> @@ -515,6 +515,19 @@ char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv,
>> out = xrealloc(out, outalloc);
>> outpos = out + sofar;
>> outsz = outalloc - sofar - 1;
>> +#ifdef ICONV_BREAKS
>> + /*
>> + * If iconv(3) messes up piecemeal conversions
>> + * then restore the original pointers, sizes,
>> + * and converter state, then retry converting
>> + * the full string using the reallocated buffer.
>> + */
>> + insz += (char *)cp - in;
>> + cp = (iconv_ibp)in;
>> + outpos = out + bom_len;
>> + outsz = outalloc - bom_len - 1;
>> + iconv(conv, NULL, NULL, NULL, NULL);
>> +#endif
>> }
>> else {
>> *outpos = '\0';
>
>
> I am not sure, if I understand the second call to iconv(NULL....)
It resets the state of the converter, e.g. the current code page of
encodings that have multiple ones.
> Here is a slightly different patch.
> Comments wellcome.
>
>
> diff --git a/utf8.c b/utf8.c
> index 35a0251939..b3c1dd2b59 100644
> --- a/utf8.c
> +++ b/utf8.c
> @@ -486,10 +486,11 @@ int utf8_fprintf(FILE *stream, const char *format, ...)
> char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv,
> size_t bom_len, size_t *outsz_p)
> {
> - size_t outsz, outalloc;
> + size_t outsz, outalloc, originsz;
> char *out, *outpos;
> iconv_ibp cp;
>
> + originsz = insz;
> outsz = insz;
> outalloc = st_add(outsz, 1 + bom_len); /* for terminating NUL */
> out = xmalloc(outalloc);
> @@ -515,6 +516,17 @@ char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv,
> out = xrealloc(out, outalloc);
> outpos = out + sofar;
> outsz = outalloc - sofar - 1;
> +#ifdef __APPLE__
> + /*
> + * Several version of iconv(3) mess up piecemeal conversions.
> + * Restore the original pointers, sizes,
> + * and converter state, then retry converting
> + * the full string using the reallocated buffer.
> + */
> + insz = originsz;
> + outpos = out + bom_len;
> + cp = (iconv_ibp)in;
This forgets to reset outsz and the converter state. With this patch
t0028-working-tree-encoding.sh seems to get stuck in an endless loop.
> +#endif
> }
> else {
> *outpos = '\0';
next prev parent reply other threads:[~2025-12-09 19:35 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-08 22:59 t3900 failure on macOS, iconv(3) broken? René Scharfe
2025-12-09 3:18 ` Koji Nakamaru
2025-12-09 3:50 ` Yee Cheng Chin
2025-12-09 4:03 ` Collin Funk
2025-12-09 16:33 ` Torsten Bögershausen
2025-12-09 19:35 ` René Scharfe [this message]
2025-12-09 21:24 ` Torsten Bögershausen
2025-12-09 22:25 ` René Scharfe
2025-12-09 19:35 ` [PATCH] config.mak.uname: use iconv from Homebrew on macOS René Scharfe
2025-12-09 20:39 ` Yee Cheng Chin
2025-12-09 21:27 ` René Scharfe
2025-12-10 11:17 ` Carlo Marcelo Arenas Belón
2025-12-10 17:56 ` René Scharfe
2025-12-11 2:53 ` Junio C Hamano
2025-12-11 11:17 ` Carlo Marcelo Arenas Belón
2025-12-12 2:20 ` Junio C Hamano
2025-12-12 9:16 ` René Scharfe
2025-12-12 10:02 ` Carlo Marcelo Arenas Belón
2025-12-12 13:04 ` Re* " Junio C Hamano
2025-12-12 13:48 ` René Scharfe
2025-12-12 23:39 ` Junio C Hamano
2025-12-10 16:42 ` Torsten Bögershausen
2025-12-10 17:56 ` René Scharfe
2025-12-10 23:10 ` brian m. carlson
2025-12-11 2:36 ` Junio C Hamano
2025-12-11 9:59 ` Junio C Hamano
2025-12-11 14:34 ` René Scharfe
2025-12-12 3:35 ` Junio C Hamano
2025-12-12 10:40 ` t3900 failure on macOS, iconv(3) broken? René Scharfe
2025-12-13 18:42 ` [PATCH v2 1/2] Makefile: add NO_HOMEBREW René Scharfe
2025-12-14 6:45 ` Torsten Bögershausen
2025-12-14 7:13 ` Junio C Hamano
2025-12-14 9:02 ` Torsten Bögershausen
2025-12-14 11:07 ` Junio C Hamano
2025-12-14 11:13 ` René Scharfe
2025-12-14 23:19 ` Junio C Hamano
2025-12-16 18:53 ` René Scharfe
2025-12-13 18:42 ` [PATCH v2 2/2] config.mak.uname: use iconv from Homebrew on macOS René Scharfe
2025-12-16 18:53 ` [PATCH v3 1/2] macOS: make Homebrew use configurable René Scharfe
2025-12-16 19:11 ` René Scharfe
2025-12-16 21:49 ` Torsten Bögershausen
2025-12-16 18:53 ` [PATCH v3 2/2] macOS: use iconv from Homebrew if present René Scharfe
2025-12-24 7:52 ` [PATCH v4 0/2] macOS: use iconv from Homebrew if needed and present René Scharfe
2025-12-24 8:02 ` [PATCH v4 1/2] macOS: make Homebrew use configurable René Scharfe
2025-12-24 8:03 ` [PATCH v4 2/2] macOS: use iconv from Homebrew if needed and present René Scharfe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51dc4ca7-61fd-42f7-8e72-a516a870e011@web.de \
--to=l.s.r@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=tboegi@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox