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

freebsd: fix os_self_exe_path function and update std lib

Browse Source
This commit is contained in:
Andrew Kelley 2018-12-12 22:28:15 -05:00
parent b883bc873d
commit d770333827
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/os.cpp
View File

@ -1456,7 +1456,7 @@ Error os_self_exe_path(Buf *out_path) {
if (sysctl(mib, 4, buf_ptr(out_path), &cb, nullptr, 0) != 0) {
return ErrorUnexpected;
}
buf_resize(out_path, cb);
buf_resize(out_path, cb - 1);
return ErrorNone;
#endif
return ErrorFileNotFound;

7
std/os/freebsd/index.zig
View File

@ -9,6 +9,7 @@ pub use @import("errno.zig");
const std = @import("../../index.zig");
const c = std.c;
const maxInt = std.math.maxInt;
pub const Kevent = c.Kevent;
pub const PATH_MAX = 1024;
@ -22,7 +23,7 @@ pub const PROT_READ = 1;
pub const PROT_WRITE = 2;
pub const PROT_EXEC = 4;
pub const MAP_FAILED = @maxValue(usize);
pub const MAP_FAILED = maxInt(usize);
pub const MAP_SHARED = 0x0001;
pub const MAP_PRIVATE = 0x0002;
pub const MAP_FIXED = 0x0010;
@ -700,7 +701,7 @@ pub fn sigaction(sig: u6, noalias act: *const Sigaction, noalias oact: ?*Sigacti
const NSIG = 65;
const sigset_t = [128 / @sizeOf(usize)]usize;
const all_mask = []usize{@maxValue(usize)};
const all_mask = []usize{maxInt(usize)};
const app_mask = []usize{0xfffffffc7fffffff};
/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
@ -711,7 +712,7 @@ pub const Sigaction = struct {
flags: u32,
};
pub const SIG_ERR = @intToPtr(extern fn (i32) void, @maxValue(usize));
pub const SIG_ERR = @intToPtr(extern fn (i32) void, maxInt(usize));
pub const SIG_DFL = @intToPtr(extern fn (i32) void, 0);
pub const SIG_IGN = @intToPtr(extern fn (i32) void, 1);
pub const empty_sigset = []usize{0} ** sigset_t.len;