From e05923f34b566a47d81ee955ec170a855ac99a1d Mon Sep 17 00:00:00 2001 From: Michael Dusan Date: Tue, 12 May 2020 15:53:33 -0400 Subject: [PATCH] macos: use realpath$DARWIN_EXTSN macOS 10.15 Catalina causes an ancient variant of `realpath` to fail, likely due to 10.15's evolving security model. closes #5325 --- lib/std/c.zig | 11 ++++++++++- lib/std/c/darwin.zig | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/std/c.zig b/lib/std/c.zig index 0f166b7e5..555a4e4ce 100644 --- a/lib/std/c.zig +++ b/lib/std/c.zig @@ -111,7 +111,16 @@ pub extern "c" fn dup(fd: fd_t) c_int; pub extern "c" fn dup2(old_fd: fd_t, new_fd: fd_t) c_int; pub extern "c" fn readlink(noalias path: [*:0]const u8, noalias buf: [*]u8, bufsize: usize) isize; pub extern "c" fn readlinkat(dirfd: fd_t, noalias path: [*:0]const u8, noalias buf: [*]u8, bufsize: usize) isize; -pub extern "c" fn realpath(noalias file_name: [*:0]const u8, noalias resolved_name: [*]u8) ?[*:0]u8; + +pub usingnamespace switch (builtin.os.tag) { + .macosx, .ios, .watchos, .tvos => struct { + pub const realpath = @"realpath$DARWIN_EXTSN"; + }, + else => struct { + pub extern "c" fn realpath(noalias file_name: [*:0]const u8, noalias resolved_name: [*]u8) ?[*:0]u8; + }, +}; + pub extern "c" fn setreuid(ruid: c_uint, euid: c_uint) c_int; pub extern "c" fn setregid(rgid: c_uint, egid: c_uint) c_int; pub extern "c" fn rmdir(path: [*:0]const u8) c_int; diff --git a/lib/std/c/darwin.zig b/lib/std/c/darwin.zig index 74922daa0..f827eb686 100644 --- a/lib/std/c/darwin.zig +++ b/lib/std/c/darwin.zig @@ -12,6 +12,8 @@ pub extern "c" fn _dyld_get_image_header(image_index: u32) ?*mach_header; pub extern "c" fn _dyld_get_image_vmaddr_slide(image_index: u32) usize; pub extern "c" fn _dyld_get_image_name(image_index: u32) [*:0]const u8; +pub extern "c" fn @"realpath$DARWIN_EXTSN"(noalias file_name: [*:0]const u8, noalias resolved_name: [*]u8) ?[*:0]u8; + pub extern "c" fn __getdirentries64(fd: c_int, buf_ptr: [*]u8, buf_len: usize, basep: *i64) isize; pub extern "c" fn @"fstat$INODE64"(fd: fd_t, buf: *Stat) c_int;