Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 16:56:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

os: we need to copy the old lang pointer before we unsetenv

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-09-29 12:56:43 -07:00
parent 071a53bb33
commit 38a7c2270b
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/os/locale.zig
View File

@ -26,7 +26,7 @@ pub fn ensureLocale() void {
// Set the locale to whatever is set in env vars. // Set the locale to whatever is set in env vars.
if (setlocale(LC_ALL, "")) |v| { if (setlocale(LC_ALL, "")) |v| {
log.debug("setlocale result={s}", .{v}); log.info("setlocale from env result={s}", .{v});
return; return;
} }
@ -34,19 +34,30 @@ pub fn ensureLocale() void {
// invalid. Try to set it without the LANG var set to use the system // invalid. Try to set it without the LANG var set to use the system
// default. // default.
if (std.os.getenv("LANG")) |old_lang| { if (std.os.getenv("LANG")) |old_lang| {
_ = unsetenv("LANG"); if (old_lang.len > 0) {
defer _ = setenv("LANG", old_lang.ptr, 1); // The old_lang pointer can be invalidated by unsetenv so we need
// to make a copy. LANG should never be longer than 128 bytes. If
// it is, we just set it to "".
var buf: [128]u8 = undefined;
var fba = std.heap.FixedBufferAllocator.init(&buf);
const alloc = fba.allocator();
const old_copy = alloc.dupeZ(u8, old_lang) catch "";
if (setlocale(LC_ALL, "")) |v| { // Unset the lang and defer to reset the copy.
log.debug("setlocale result={s}", .{v}); _ = unsetenv("LANG");
return; defer _ = setenv("LANG", old_copy.ptr, 1);
if (setlocale(LC_ALL, "")) |v| {
log.info("setlocale after unset lang result={s}", .{v});
return;
}
} }
} }
// Failure again... fallback to en_US.UTF-8 // Failure again... fallback to en_US.UTF-8
log.warn("setlocale failed with LANG and system default. Falling back to en_US.UTF-8", .{}); log.warn("setlocale failed with LANG and system default. Falling back to en_US.UTF-8", .{});
if (setlocale(LC_ALL, "en_US.UTF-8")) |v| { if (setlocale(LC_ALL, "en_US.UTF-8")) |v| {
log.debug("setlocale result={s}", .{v}); log.info("setlocale default result={s}", .{v});
return; return;
} else log.err("setlocale failed even with the fallback, uncertain results", .{}); } else log.err("setlocale failed even with the fallback, uncertain results", .{});
} }