mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 04:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

openbsd: selfExePath adjustements

Browse Source
This commit is contained in:
Sébastien Marie 2020-10-11 12:23:52 +00:00
parent 4c4211ea8e
commit a6dc2b7fcc
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/std/fs.zig
View File

@ -2244,19 +2244,18 @@ pub fn selfExePath(out_buffer: []u8) SelfExePathError![]u8 {
return error.NameTooLong;
mem.copy(u8, out_buffer, real_path);
return out_buffer[0..real_path.len];
} else if (os.argv[0][0] != '\x00') {
} else if (argv0.len != 0) {
// argv[0] is not empty (and not a path): search it inside PATH
const paths = std.os.getenv("PATH") orelse "";
var path_it = mem.split(paths, ":");
const PATH = std.os.getenv("PATH") orelse "";
var path_it = mem.tokenize(PATH, &[_]u8{path.delimiter});
while (path_it.next()) |a_path| {
var resolved_path_buf: [MAX_PATH_BYTES:0]u8 = undefined;
var resolved_path_buf: [MAX_PATH_BYTES-1:0]u8 = undefined;
const resolved_path = std.fmt.bufPrint(&resolved_path_buf, "{}/{}\x00", .{
a_path,
os.argv[0],
}) catch "";
var real_path_buf: [MAX_PATH_BYTES:0]u8 = undefined;
var real_path_buf: [MAX_PATH_BYTES]u8 = undefined;
if (os.realpathZ(&resolved_path_buf, &real_path_buf) catch null) |real_path| {
// found a file, and hope it is the right file
if (real_path.len > out_buffer.len)