superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use `home()` from `os/homedir`, check for `~/` rather than `~`

pull/3811/head
z-jxy 2024-12-28 20:04:49 -05:00 committed by Mitchell Hashimoto
parent 7c9c982df7
commit d27761a499
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/config/Config.zig
View File

@ -4363,27 +4363,9 @@ pub const RepeatablePath = struct {
var buf: [std.fs.max_path_bytes]u8 = undefined; var buf: [std.fs.max_path_bytes]u8 = undefined;
// Check if the path starts with a tilde and expand it to the home directory on linux/mac // Check if the path starts with a tilde and expand it to the home directory on linux/mac
if (path[0] == '~') { if (std.mem.startsWith(u8, path, "~/")) {
const home_env_var = switch (builtin.os.tag) { const home_var = try internal_os.home(&buf); // cache this?
.linux, .macos => std.posix.getenv("HOME"), if (home_var) |home_dir| {
.windows => null,
else => null,
};
if (home_env_var) |home_dir| {
// very unlikely to happen
if (!std.fs.path.isAbsolute(home_dir)) {
try diags.append(alloc, .{
.message = try std.fmt.allocPrintZ(
alloc,
"error resolving file path {s}: HOME environment variable is not an absolute path",
.{path},
),
});
self.value.items[i] = .{ .required = "" };
continue;
}
const rest = path[1..]; // Skip the ~ const rest = path[1..]; // Skip the ~
const expanded_len = home_dir.len + rest.len; const expanded_len = home_dir.len + rest.len;
if (expanded_len > buf.len) { if (expanded_len > buf.len) {
@ -4398,7 +4380,6 @@ pub const RepeatablePath = struct {
continue; continue;
} }
@memcpy(buf[0..home_dir.len], home_dir);
@memcpy(buf[home_dir.len..expanded_len], rest); @memcpy(buf[home_dir.len..expanded_len], rest);
log.debug( log.debug(