eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-23 07:17:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tb/macos-iconv-workarounds'

Browse Source 
The iconv library on macOS fails to correctly handle stateful
ISO/IEC 2022 encoded strings.  Work it around instead of replacing
it wholesale from homebrew.

* tb/macos-iconv-workarounds:
  utf8.c: enable workaround for iconv under macOS 14/15
  utf8.c: prepare workaround for iconv under macOS 14/15
This commit is contained in:
Junio C Hamano 2026-01-21 08:28:57 -08:00
commit 0a5dcc1259
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -1687,11 +1687,21 @@ ifeq ($(uname_S),Darwin)
BASIC_CFLAGS += -I/sw/include
BASIC_LDFLAGS += -L/sw/lib
endif
ifeq ($(shell test -d /opt/sw/lib && echo y),y)
BASIC_CFLAGS += -I/opt/sw/include
BASIC_LDFLAGS += -L/opt/sw/lib
ifeq ($(shell test -e /opt/sw/lib/libiconv.dylib && echo y),y)
HAS_GOOD_LIBICONV = Yes
endif
endif
endif
ifndef NO_DARWIN_PORTS
ifeq ($(shell test -d /opt/local/lib && echo y),y)
BASIC_CFLAGS += -I/opt/local/include
BASIC_LDFLAGS += -L/opt/local/lib
ifeq ($(shell test -e /opt/local/lib/libiconv.dylib && echo y),y)
HAS_GOOD_LIBICONV = Yes
endif
endif
endif
ifndef NO_APPLE_COMMON_CRYPTO
@ -1714,6 +1724,7 @@ endif
ifdef USE_HOMEBREW_LIBICONV
ifeq ($(shell test -d $(HOMEBREW_PREFIX)/opt/libiconv && echo y),y)
ICONVDIR ?= $(HOMEBREW_PREFIX)/opt/libiconv
HAS_GOOD_LIBICONV = Yes
endif
endif
endif
@ -1859,6 +1870,11 @@ ifndef NO_ICONV
endif
EXTLIBS += $(ICONV_LINK) -liconv
endif
ifdef NEEDS_GOOD_LIBICONV
ifndef HAS_GOOD_LIBICONV
BASIC_CFLAGS += -DICONV_RESTART_RESET
endif
endif
endif
ifdef ICONV_OMITS_BOM
BASIC_CFLAGS += -DICONV_OMITS_BOM

1
config.mak.uname
View File

@ -157,6 +157,7 @@ ifeq ($(uname_S),Darwin)
endif
ifeq ($(shell test "$(DARWIN_MAJOR_VERSION)" -ge 24 && echo 1),1)
USE_HOMEBREW_LIBICONV = UnfortunatelyYes
NEEDS_GOOD_LIBICONV = UnfortunatelyYes
endif
# The builtin FSMonitor on MacOS builds upon Simple-IPC. Both require

13
utf8.c
View File

@ -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_RESTART_RESET
/*
* 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 += cp - (iconv_ibp)in; /* Restore insz */
cp = (iconv_ibp)in; /* original start value */
outpos = out + bom_len; /* original start value */
outsz = outalloc - bom_len - 1; /* new len */
iconv(conv, NULL, NULL, NULL, NULL); /* reset iconv machinery */
#endif
}
else {
*outpos = '\0';