refactor(terminal-name): use the new Environ
This commit is contained in:
@@ -34,8 +34,8 @@ fn parseBashVersion(shell_version_output: []u8) ?[]u8 {
|
|||||||
return shell_version_output[version_keyword_index.? + version_keyword.len .. end_index.?];
|
return shell_version_output[version_keyword_index.? + version_keyword.len .. end_index.?];
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn getTerminalName(allocator: std.mem.Allocator) ![]u8 {
|
pub fn getTerminalName(allocator: std.mem.Allocator, environ: std.process.Environ) ![]u8 {
|
||||||
const term_program = std.process.getEnvVarOwned(allocator, "TERM_PROGRAM") catch |err| if (err == error.EnvironmentVariableNotFound) {
|
const term_program = std.process.Environ.getAlloc(environ, allocator, "TERM_PROGRAM") catch |err| if (err == error.EnvironmentVariableNotFound) {
|
||||||
return allocator.dupe(u8, "Unknown");
|
return allocator.dupe(u8, "Unknown");
|
||||||
} else return err;
|
} else return err;
|
||||||
return term_program;
|
return term_program;
|
||||||
|
|||||||
@@ -37,8 +37,8 @@ fn parseBashVersion(shell_version_output: []u8) ?[]u8 {
|
|||||||
return shell_version_output[version_keyword_index.? + version_keyword.len .. end_index.?];
|
return shell_version_output[version_keyword_index.? + version_keyword.len .. end_index.?];
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn getTerminalName(allocator: std.mem.Allocator) ![]u8 {
|
pub fn getTerminalName(allocator: std.mem.Allocator, environ: std.process.Environ) ![]u8 {
|
||||||
const term_program = std.process.getEnvVarOwned(allocator, "TERM_PROGRAM") catch |err| if (err == error.EnvironmentVariableNotFound) {
|
const term_program = std.process.Environ.getAlloc(environ, allocator, "TERM_PROGRAM") catch |err| if (err == error.EnvironmentVariableNotFound) {
|
||||||
return allocator.dupe(u8, "Unknown");
|
return allocator.dupe(u8, "Unknown");
|
||||||
} else return err;
|
} else return err;
|
||||||
return term_program;
|
return term_program;
|
||||||
|
|||||||
Reference in New Issue
Block a user