colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

bunpen: preserve environment across exec boundary

Browse Source
This commit is contained in:
Colin
2024-08-27 18:35:37 +00:00
parent b9fc61e627
commit 7dbe64e52f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/additional/bunpen/main.ha
View File

@@ -16,7 +16,7 @@ fn do_exec(path: str, args: []str) (os::exec::error | void) = {
log::printfln("exec ({}): {}", path, joined); log::printfln("exec ({}): {}", path, joined);
}; };
rtext::check_error("exec", rtext::execve(path, args)); rtext::check_error("exec", rtext::execve(path, args, os::getenvs()));
// XXX: os::exec::exec offers no way to preserve argv0, but it does // XXX: os::exec::exec offers no way to preserve argv0, but it does
// work if you don't care about that: // work if you don't care about that:

3
pkgs/additional/bunpen/rtext/exec.ha
View File

@@ -12,8 +12,7 @@ export fn execve(path: str, argv: []str, envp: []str = []) (rt::errno | void) =
make_cstr(&path_buf, path): uintptr: u64, make_cstr(&path_buf, path): uintptr: u64,
// XXX: this "leaks" the c arrays, but not much can be done about that // XXX: this "leaks" the c arrays, but not much can be done about that
to_cstr_array(argv): *[*]nullable *const c::char: uintptr: u64, to_cstr_array(argv): *[*]nullable *const c::char: uintptr: u64,
0, to_cstr_array(envp): *[*]nullable *const c::char: uintptr: u64,
// to_cstr_array(envp): *[*]nullable *const c::char: uintptr: u64,
)?; )?;
}; };