git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Torsten Bögershausen" <tboegi@web.de>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git List <git@vger.kernel.org>
Subject: Re: t3900 failure on macOS, iconv(3) broken?
Date: Tue, 9 Dec 2025 22:24:20 +0100	[thread overview]
Message-ID: <20251209212420.GA10149@tb-raspi4> (raw)
In-Reply-To: <51dc4ca7-61fd-42f7-8e72-a516a870e011@web.de>

On Tue, Dec 09, 2025 at 08:35:23PM +0100, René Scharfe wrote:
> On 12/9/25 5:33 PM, Torsten Bögershausen wrote:
> > On Mon, Dec 08, 2025 at 11:59:11PM +0100, René Scharfe wrote:
> >>
[snip]
> 
> 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.

Thanks for testing.
I did another test here
(increase the outbuffer with only one byte per round, old MacOs)
and yes, we need to reset iconv.
Back to your patch. I think it is good to go further,
with one or 2 remarks, see TB
 
			out = xrealloc(out, outalloc);
			// TB: move into else outpos = out + sofar;
			// TB: move into else outsz = outalloc - sofar - 1;
// TB: We have seen different breakages of apple iconv. Should we run the same code
// on all versions of MacOs to be more future proof ?
// and do we need a Makefile knob, if one, and only one platform is affected ?
// I don't know
#ifdef __APPLE__
or
#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;    /* TB stumbled here: "in" is "const char *"
			                              And I didn't like the fact that insz is destroyed
						      and needs to be restored. That is why I had a originsz
						      (or szinorig ?)
			cp = (iconv_ibp)in;
			outpos = out + bom_len;
			outsz = outalloc - bom_len - 1;
			iconv(conv, NULL, NULL, NULL, NULL);
#else
			outpos = out + sofar;
			outsz = outalloc - sofar - 1;
#endif

  reply	other threads:[~2025-12-09 21:24 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
2025-12-09 21:24     ` Torsten Bögershausen [this message]
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=20251209212420.GA10149@tb-raspi4 \
    --to=tboegi@web.de \
    --cc=git@vger.kernel.org \
    --cc=l.s.r@web.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).