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

termio: tweaks to xdg data dir handling (no logic changes)

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-11-17 09:48:25 -08:00
parent 8e736aa4eb
commit 3e971f2837
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/termio/shell_integration.zig
View File

@ -448,6 +448,8 @@ fn setupXdgDataDirs(
try env.put("GHOSTTY_SHELL_INTEGRATION_XDG_DIR", integ_dir); try env.put("GHOSTTY_SHELL_INTEGRATION_XDG_DIR", integ_dir);
{ {
const xdg_data_dir_key = "XDG_DATA_DIRS";
// We attempt to avoid allocating by using the stack up to 4K. // We attempt to avoid allocating by using the stack up to 4K.
// Max stack size is considerably larger on macOS and Linux but // Max stack size is considerably larger on macOS and Linux but
// 4K is a reasonable size for this for most cases. However, env // 4K is a reasonable size for this for most cases. However, env
@ -456,21 +458,20 @@ fn setupXdgDataDirs(
var stack_alloc_state = std.heap.stackFallback(4096, alloc_arena); var stack_alloc_state = std.heap.stackFallback(4096, alloc_arena);
const stack_alloc = stack_alloc_state.get(); const stack_alloc = stack_alloc_state.get();
const old_value = if (env.get("XDG_DATA_DIRS")) |old| // If no XDG_DATA_DIRS set use the default value as specified.
old // This ensures that the default directories aren't lost by setting
else // our desired integration dir directly. See #2711.
// No XDG_DATA_DIRS set, we prepend to the default value. // <https://specifications.freedesktop.org/basedir-spec/0.6/#variables>
// <https://specifications.freedesktop.org/basedir-spec/0.6/#variables> const old = env.get(xdg_data_dir_key) orelse "/usr/local/share:/usr/share";
"/usr/local/share:/usr/share";
const prepended = try std.fmt.allocPrint( const prepended = try std.fmt.allocPrint(stack_alloc, "{s}{c}{s}", .{
stack_alloc, integ_dir,
"{s}{c}{s}", std.fs.path.delimiter,
.{ integ_dir, std.fs.path.delimiter, old_value }, old,
); });
defer stack_alloc.free(prepended); defer stack_alloc.free(prepended);
try env.put("XDG_DATA_DIRS", prepended); try env.put(xdg_data_dir_key, prepended);
} }
} }