authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-10-23 09:23:51+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-10-24 07:23:58+02:00
log11c8c38332ada0585a8690e84c8de3affb34c935
treedc8aa3968f27bd928111bc9aa52f8fefed5f0d76
parent77d0a9c07e8880bdb222d87ece66a7d822a76748

disentangle std.c and std.posix on Windows

std.c should reflect the CRT, not std.posix's bizarre view of the world. Also: * Audit some incorrect std.c types and function signatures * Remove ws2_32 from std.c (dubious quality, and ws2_32 isn't libc) * Remove remnants of Windows support in std.posix closes https://codeberg.org/ziglang/zig/issues/37382

13 files changed, 234 insertions(+), 205 deletions(-)

lib/std/Io/Dir.zig+1-1
......@@ -12,7 +12,7 @@ const Allocator = std.mem.Allocator;
1212
1313handle: Handle,
1414
15pub const Handle = std.posix.fd_t;
15pub const Handle = File.Handle;
1616
1717pub const path = std.fs.path;
1818
lib/std/Io/File.zig+5-5
......@@ -23,7 +23,7 @@ pub const Flags = struct {
2323 nonblocking: bool,
2424};
2525
26pub const Handle = std.posix.fd_t;
26pub const Handle = if (native_os == .windows) std.os.windows.HANDLE else std.posix.fd_t;
2727
2828pub const Reader = @import("File/Reader.zig");
2929pub const Writer = @import("File/Writer.zig");
......@@ -34,10 +34,10 @@ pub const MemoryMap = @import("File/MemoryMap.zig");
3434/// deadlocking.
3535pub const MultiReader = @import("File/MultiReader.zig");
3636
37pub const INode = std.posix.ino_t;
38pub const NLink = std.posix.nlink_t;
39pub const Uid = std.posix.uid_t;
40pub const Gid = std.posix.gid_t;
37pub const INode = if (native_os == .windows) std.os.windows.LARGE_INTEGER else std.posix.ino_t;
38pub const NLink = if (native_os == .windows) std.os.windows.ULONG else std.posix.nlink_t;
39pub const Uid = if (native_os == .windows) void else std.posix.uid_t;
40pub const Gid = if (native_os == .windows) void else std.posix.gid_t;
4141pub const BlockSize = u32;
4242
4343pub const Kind = enum {
lib/std/Io/Threaded.zig+74-65
......@@ -1614,7 +1614,7 @@ pub const default_PATH = "/usr/local/bin:/bin:/usr/bin";
16141614const max_windows_kernel_bug_retries = 13;
16151615
16161616comptime {
1617 if (@TypeOf(posix.IOV_MAX) != void) assert(max_iovecs_len <= posix.IOV_MAX);
1617 if (!is_windows and @TypeOf(posix.IOV_MAX) != void) assert(max_iovecs_len <= posix.IOV_MAX);
16181618}
16191619
16201620pub const InitOptions = struct {
......@@ -1696,7 +1696,7 @@ pub fn init(
16961696 .disable_memory_mapping = options.disable_memory_mapping,
16971697 };
16981698
1699 if (posix.Sigaction != void) {
1699 if (!is_windows and posix.Sigaction != void) {
17001700 // This causes sending `posix.SIG.IO` to thread to interrupt blocking
17011701 // syscalls, returning `posix.E.INTR`.
17021702 const act: posix.Sigaction = .{
......@@ -1758,7 +1758,7 @@ pub fn setAsyncLimit(t: *Threaded, new_limit: Io.Limit) void {
17581758
17591759pub fn deinit(t: *Threaded) void {
17601760 t.join();
1761 if (posix.Sigaction != void and t.have_signal_handler) {
1761 if (!is_windows and posix.Sigaction != void and t.have_signal_handler) {
17621762 if (have_sig_io) posix.sigaction(.IO, &t.old_sig_io, null);
17631763 if (have_sig_pipe) posix.sigaction(.PIPE, &t.old_sig_pipe, null);
17641764 }
......@@ -2009,8 +2009,8 @@ const have_preadv = switch (native_os) {
20092009 .windows, .haiku => false,
20102010 else => true,
20112011};
2012const have_sig_io = posix.SIG != void and @hasField(posix.SIG, "IO");
2013const have_sig_pipe = posix.SIG != void and @hasField(posix.SIG, "PIPE");
2012const have_sig_io = !is_windows and posix.SIG != void and @hasField(posix.SIG, "IO");
2013const have_sig_pipe = !is_windows and posix.SIG != void and @hasField(posix.SIG, "PIPE");
20142014const have_sendfile = if (builtin.link_libc) @TypeOf(std.c.sendfile) != void else native_os == .linux;
20152015const have_copy_file_range = switch (native_os) {
20162016 .linux, .freebsd => true,
......@@ -7283,6 +7283,8 @@ fn fileHardLink(
72837283 const t: *Threaded = @ptrCast(@alignCast(userdata));
72847284 _ = t;
72857285
7286 if (is_windows) return error.OperationUnsupported;
7287
72867288 var new_path_buffer: [posix.PATH_MAX]u8 = undefined;
72877289 const new_sub_path_posix = try pathToPosix(new_sub_path, &new_path_buffer);
72887290
......@@ -12229,7 +12231,7 @@ fn netListenUnixPosix(
1222912231 if (!net.has_unix_sockets) return error.AddressFamilyUnsupported;
1223012232 const t: *Threaded = @ptrCast(@alignCast(userdata));
1223112233 _ = t;
12232 const socket_fd = openSocketPosix(posix.AF.UNIX, .{ .mode = .stream }) catch |err| switch (err) {
12234 const socket_fd = openSocketPosix(AF.UNIX, .{ .mode = .stream }) catch |err| switch (err) {
1223312235 error.ProtocolUnsupportedBySystem => return error.AddressFamilyUnsupported,
1223412236 error.ProtocolUnsupportedByAddressFamily => return error.AddressFamilyUnsupported,
1223512237 error.SocketModeUnsupported => return error.AddressFamilyUnsupported,
......@@ -12308,8 +12310,8 @@ fn netListenUnixWindows(
1230812310
1230912311fn posixBindUnix(
1231012312 fd: posix.socket_t,
12311 addr: *const posix.sockaddr,
12312 addr_len: posix.socklen_t,
12313 addr: *const sockaddr,
12314 addr_len: socklen_t,
1231312315) !void {
1231412316 const syscall: Syscall = try .start();
1231512317 while (true) {
......@@ -12351,8 +12353,8 @@ fn posixBindUnix(
1235112353
1235212354fn posixBind(
1235312355 socket_fd: posix.socket_t,
12354 addr: *const posix.sockaddr,
12355 addr_len: posix.socklen_t,
12356 addr: *const sockaddr,
12357 addr_len: socklen_t,
1235612358) !void {
1235712359 const syscall: Syscall = try .start();
1235812360 while (true) {
......@@ -12386,8 +12388,8 @@ fn posixBind(
1238612388
1238712389fn posixConnect(
1238812390 socket_fd: posix.socket_t,
12389 addr: *const posix.sockaddr,
12390 addr_len: posix.socklen_t,
12391 addr: *const sockaddr,
12392 addr_len: socklen_t,
1239112393) !void {
1239212394 const syscall: Syscall = try .start();
1239312395 while (true) switch (posix.errno(posix.system.connect(socket_fd, addr, addr_len))) {
......@@ -12424,8 +12426,8 @@ fn posixConnect(
1242412426
1242512427fn posixConnectUnix(
1242612428 fd: posix.socket_t,
12427 addr: *const posix.sockaddr,
12428 addr_len: posix.socklen_t,
12429 addr: *const sockaddr,
12430 addr_len: socklen_t,
1242912431) !void {
1243012432 const syscall: Syscall = try .start();
1243112433 while (true) {
......@@ -12468,8 +12470,8 @@ fn posixConnectUnix(
1246812470
1246912471fn posixGetSockName(
1247012472 socket_fd: posix.fd_t,
12471 addr: *posix.sockaddr,
12472 addr_len: *posix.socklen_t,
12473 addr: *sockaddr,
12474 addr_len: *socklen_t,
1247312475) !void {
1247412476 const syscall: Syscall = try .start();
1247512477 while (true) {
......@@ -12610,7 +12612,7 @@ fn netConnectUnixPosix(
1261012612 if (!net.has_unix_sockets) return error.AddressFamilyUnsupported;
1261112613 const t: *Threaded = @ptrCast(@alignCast(userdata));
1261212614 _ = t;
12613 const socket_fd = openSocketPosix(posix.AF.UNIX, .{ .mode = .stream }) catch |err| switch (err) {
12615 const socket_fd = openSocketPosix(AF.UNIX, .{ .mode = .stream }) catch |err| switch (err) {
1261412616 error.ProtocolUnsupportedByAddressFamily => return error.AddressFamilyUnsupported,
1261512617 error.OptionUnsupported => return error.Unexpected,
1261612618 else => |e| return e,
......@@ -12705,7 +12707,7 @@ fn netBindIpWindows(
1270512707}
1270612708
1270712709fn openSocketPosix(
12708 family: posix.sa_family_t,
12710 family: sa_family_t,
1270912711 options: IpAddress.BindOptions,
1271012712) error{
1271112713 AddressFamilyUnsupported,
......@@ -12720,7 +12722,7 @@ fn openSocketPosix(
1272012722 Canceled,
1272112723}!posix.socket_t {
1272212724 const mode, const protocol = try posixSocketModeProtocol(family, options.mode, options.protocol);
12723 const flags: u32 = mode | if (socket_flags_unsupported) 0 else posix.SOCK.CLOEXEC;
12725 const flags: u32 = mode | if (socket_flags_unsupported) 0 else SOCK.CLOEXEC;
1272412726 const syscall: Syscall = try .start();
1272512727 const socket_fd = while (true) {
1272612728 const rc = posix.system.socket(family, flags, protocol);
......@@ -12751,7 +12753,7 @@ fn openSocketPosix(
1275112753
1275212754 if (options.ip6_only) |ip6_only| {
1275312755 if (posix.IPV6 == void) return error.OptionUnsupported;
12754 try setSocketOptionPosix(socket_fd, posix.IPPROTO.IPV6, posix.IPV6.V6ONLY, @intFromBool(ip6_only));
12756 try setSocketOptionPosix(socket_fd, IPPROTO.IPV6, posix.IPV6.V6ONLY, @intFromBool(ip6_only));
1275512757 }
1275612758
1275712759 return socket_fd;
......@@ -12776,15 +12778,15 @@ fn netSocketCreatePair(
1277612778 const t: *Threaded = @ptrCast(@alignCast(userdata));
1277712779 _ = t;
1277812780 if (!have_networking) return error.OperationUnsupported;
12779 if (@TypeOf(posix.system.socketpair) == void) return error.OperationUnsupported;
12781 if (is_windows or @TypeOf(posix.system.socketpair) == void) return error.OperationUnsupported;
1278012782 if (native_os == .haiku) @panic("TODO");
1278112783
12782 const family: posix.sa_family_t = switch (options.family) {
12783 .ip4 => posix.AF.INET,
12784 .ip6 => posix.AF.INET6,
12784 const family: sa_family_t = switch (options.family) {
12785 .ip4 => AF.INET,
12786 .ip6 => AF.INET6,
1278512787 };
1278612788 const mode, const protocol = try posixSocketModeProtocol(family, options.mode, options.protocol);
12787 const flags: u32 = mode | if (socket_flags_unsupported) 0 else posix.SOCK.CLOEXEC;
12789 const flags: u32 = mode | if (socket_flags_unsupported) 0 else SOCK.CLOEXEC;
1278812790
1278912791 var sockets: [2]posix.socket_t = undefined;
1279012792 const syscall: Syscall = try .start();
......@@ -12800,7 +12802,7 @@ fn netSocketCreatePair(
1280012802 try setCloexec(sockets[1]);
1280112803 }
1280212804 var storages: [2]PosixAddress = undefined;
12803 var addr_lens: [2]posix.socklen_t = .{ @sizeOf(PosixAddress), @sizeOf(PosixAddress) };
12805 var addr_lens: [2]socklen_t = .{ @sizeOf(PosixAddress), @sizeOf(PosixAddress) };
1280412806 try posixGetSockName(sockets[0], &storages[0].any, &addr_lens[0]);
1280512807 try posixGetSockName(sockets[1], &storages[1].any, &addr_lens[1]);
1280612808 return .{
......@@ -12926,11 +12928,11 @@ fn netAccept(t: *Threaded, listen_fd: net.Socket.Handle, options: net.Server.Acc
1292612928
1292712929fn netAcceptPosix(listen_fd: net.Socket.Handle) net.Server.AcceptError!net.Socket {
1292812930 var storage: PosixAddress = undefined;
12929 var addr_len: posix.socklen_t = @sizeOf(PosixAddress);
12931 var addr_len: socklen_t = @sizeOf(PosixAddress);
1293012932 const syscall: Syscall = try .start();
1293112933 const fd = while (true) {
1293212934 const rc = if (have_accept4)
12933 posix.system.accept4(listen_fd, &storage.any, &addr_len, posix.SOCK.CLOEXEC)
12935 posix.system.accept4(listen_fd, &storage.any, &addr_len, SOCK.CLOEXEC)
1293412936 else
1293512937 posix.system.accept(listen_fd, &storage.any, &addr_len);
1293612938 switch (posix.errno(rc)) {
......@@ -13788,7 +13790,7 @@ fn netInterfaceNameResolve(
1378813790 const t: *Threaded = @ptrCast(@alignCast(userdata));
1378913791
1379013792 if (native_os == .linux) {
13791 const sock_fd = openSocketPosix(posix.AF.UNIX, .{ .mode = .dgram }) catch |err| switch (err) {
13793 const sock_fd = openSocketPosix(AF.UNIX, .{ .mode = .dgram }) catch |err| switch (err) {
1379213794 error.ProcessFdQuotaExceeded => return error.SystemResources,
1379313795 error.SystemFdQuotaExceeded => return error.SystemResources,
1379413796 error.AddressFamilyUnsupported => return error.Unexpected,
......@@ -13950,7 +13952,7 @@ fn netInterfaceName(userdata: ?*anyopaque, interface: net.Interface) net.Interfa
1395013952 else => |err| return windows.unexpectedError(err),
1395113953 }
1395213954 var name_w: [net.Interface.Name.max_len:0]windows.WCHAR = undefined;
13953 switch (ConvertInterfaceLuidToNameW.?(&luid, &name_w, name_w.len)) {
13955 switch (ConvertInterfaceLuidToNameW.?(&luid, &name_w, name_w.len + 1)) {
1395413956 .SUCCESS => {},
1395513957 .INVALID_PARAMETER => unreachable,
1395613958 .NOT_ENOUGH_MEMORY => return error.NameTooLong,
......@@ -14227,15 +14229,15 @@ fn netLookupFallible(
1422714229 const port_c = std.mem.printSentinel(&port_buffer, "{d}", .{options.port}, 0) catch unreachable;
1422814230
1422914231 const family: i32 = if (options.family) |f| switch (f) {
14230 .ip4 => posix.AF.INET,
14231 .ip6 => posix.AF.INET6,
14232 } else posix.AF.UNSPEC;
14232 .ip4 => AF.INET,
14233 .ip6 => AF.INET6,
14234 } else AF.UNSPEC;
1423314235
1423414236 const hints: posix.addrinfo = .{
1423514237 .flags = .{ .CANONNAME = options.canonical_name_buffer != null, .NUMERICSERV = true },
1423614238 .family = family,
14237 .socktype = posix.SOCK.STREAM,
14238 .protocol = posix.IPPROTO.TCP,
14239 .socktype = SOCK.STREAM,
14240 .protocol = IPPROTO.TCP,
1423914241 .canonname = null,
1424014242 .addr = null,
1424114243 .addrlen = 0,
......@@ -14489,47 +14491,54 @@ fn processSetCurrentPath(userdata: ?*anyopaque, path: []const u8) process.SetCur
1448914491 return chdir(path);
1449014492}
1449114493
14494const sockaddr = if (is_windows) ws2_32.sockaddr else posix.sockaddr;
14495const sa_family_t = if (is_windows) ws2_32.ADDRESS_FAMILY else posix.sa_family_t;
14496const socklen_t = if (is_windows) ws2_32.socklen_t else posix.socklen_t;
14497const AF = if (is_windows) ws2_32.AF else posix.AF;
14498const SOCK = if (is_windows) ws2_32.SOCK else posix.SOCK;
14499const IPPROTO = if (is_windows) ws2_32.IPPROTO else posix.IPPROTO;
14500
1449214501pub const PosixAddress = extern union {
14493 any: posix.sockaddr,
14494 in: posix.sockaddr.in,
14495 in6: posix.sockaddr.in6,
14502 any: sockaddr,
14503 in: sockaddr.in,
14504 in6: sockaddr.in6,
1449614505};
1449714506
1449814507const UnixAddress = extern union {
14499 any: posix.sockaddr,
14500 un: posix.sockaddr.un,
14508 any: sockaddr,
14509 un: sockaddr.un,
1450114510};
1450214511
14503pub fn posixAddressFamily(a: *const IpAddress) posix.sa_family_t {
14512pub fn posixAddressFamily(a: *const IpAddress) sa_family_t {
1450414513 return switch (a.*) {
14505 .ip4 => posix.AF.INET,
14506 .ip6 => posix.AF.INET6,
14514 .ip4 => AF.INET,
14515 .ip6 => AF.INET6,
1450714516 };
1450814517}
1450914518
1451014519pub fn addressFromPosix(posix_address: *const PosixAddress) IpAddress {
1451114520 return switch (posix_address.any.family) {
14512 posix.AF.INET => .{ .ip4 = address4FromPosix(&posix_address.in) },
14513 posix.AF.INET6 => .{ .ip6 = address6FromPosix(&posix_address.in6) },
14521 AF.INET => .{ .ip4 = address4FromPosix(&posix_address.in) },
14522 AF.INET6 => .{ .ip6 = address6FromPosix(&posix_address.in6) },
1451414523 else => .{ .ip4 = .loopback(0) },
1451514524 };
1451614525}
1451714526
14518pub fn addressToPosix(a: *const IpAddress, storage: *PosixAddress) posix.socklen_t {
14527pub fn addressToPosix(a: *const IpAddress, storage: *PosixAddress) socklen_t {
1451914528 return switch (a.*) {
1452014529 .ip4 => |ip4| {
1452114530 storage.in = address4ToPosix(ip4);
14522 return @sizeOf(posix.sockaddr.in);
14531 return @sizeOf(sockaddr.in);
1452314532 },
1452414533 .ip6 => |*ip6| {
1452514534 storage.in6 = address6ToPosix(ip6);
14526 return @sizeOf(posix.sockaddr.in6);
14535 return @sizeOf(sockaddr.in6);
1452714536 },
1452814537 };
1452914538}
1453014539
14531fn addressUnixToPosix(a: *const net.UnixAddress, storage: *UnixAddress) posix.socklen_t {
14532 storage.un.family = posix.AF.UNIX;
14540fn addressUnixToPosix(a: *const net.UnixAddress, storage: *UnixAddress) socklen_t {
14541 storage.un.family = AF.UNIX;
1453314542 var path_len = switch (native_os) {
1453414543 .windows => @min(a.path.len, storage.un.path.len),
1453514544 else => a.path.len,
......@@ -14545,13 +14554,13 @@ fn addressUnixToPosix(a: *const net.UnixAddress, storage: *UnixAddress) posix.so
1454514554 switch (native_os) {
1454614555 .windows => {
1454714556 if (storage.un.path[0] == 0) @memset(storage.un.path[path_len..], 0);
14548 return @sizeOf(posix.sockaddr.un);
14557 return @sizeOf(sockaddr.un);
1454914558 },
14550 else => return @intCast(@offsetOf(posix.sockaddr.un, "path") + path_len),
14559 else => return @intCast(@offsetOf(sockaddr.un, "path") + path_len),
1455114560 }
1455214561}
1455314562
14554fn address4FromPosix(in: *const posix.sockaddr.in) net.Ip4Address {
14563fn address4FromPosix(in: *const sockaddr.in) net.Ip4Address {
1455514564 // The network byte order address in `in.addr` is already the byte order we want.
1455614565 const addr_bytes: *const [4]u8 = @ptrCast(&in.addr);
1455714566 return .{
......@@ -14560,7 +14569,7 @@ fn address4FromPosix(in: *const posix.sockaddr.in) net.Ip4Address {
1456014569 };
1456114570}
1456214571
14563fn address6FromPosix(in6: *const posix.sockaddr.in6) net.Ip6Address {
14572fn address6FromPosix(in6: *const sockaddr.in6) net.Ip6Address {
1456414573 return .{
1456514574 .port = std.mem.bigToNative(u16, in6.port),
1456614575 .bytes = in6.addr,
......@@ -14569,7 +14578,7 @@ fn address6FromPosix(in6: *const posix.sockaddr.in6) net.Ip6Address {
1456914578 };
1457014579}
1457114580
14572fn address4ToPosix(a: net.Ip4Address) posix.sockaddr.in {
14581fn address4ToPosix(a: net.Ip4Address) sockaddr.in {
1457314582 // The byte order of `a.bytes` is already equivalent to a network byte order address.
1457414583 const addr_raw: *align(1) const u32 = @ptrCast(&a.bytes);
1457514584 return .{
......@@ -14578,7 +14587,7 @@ fn address4ToPosix(a: net.Ip4Address) posix.sockaddr.in {
1457814587 };
1457914588}
1458014589
14581fn address6ToPosix(a: *const net.Ip6Address) posix.sockaddr.in6 {
14590fn address6ToPosix(a: *const net.Ip6Address) sockaddr.in6 {
1458214591 return .{
1458314592 .port = std.mem.nativeToBig(u16, a.port),
1458414593 .flowinfo = a.flow,
......@@ -14592,21 +14601,21 @@ pub fn errnoBug(err: posix.E) Io.UnexpectedError {
1459214601 return error.Unexpected;
1459314602}
1459414603
14595pub fn posixSocketModeProtocol(family: posix.sa_family_t, mode: net.Socket.Mode, protocol: ?net.Protocol) !struct { u32, u32 } {
14604pub fn posixSocketModeProtocol(family: sa_family_t, mode: net.Socket.Mode, protocol: ?net.Protocol) !struct { u32, u32 } {
1459614605 return .{
1459714606 switch (mode) {
14598 .stream => posix.SOCK.STREAM,
14599 .dgram => posix.SOCK.DGRAM,
14600 .seqpacket => posix.SOCK.SEQPACKET,
14601 .raw => posix.SOCK.RAW,
14602 .rdm => if (@hasDecl(posix.SOCK, "RDM")) posix.SOCK.RDM else return error.OptionUnsupported,
14607 .stream => SOCK.STREAM,
14608 .dgram => SOCK.DGRAM,
14609 .seqpacket => SOCK.SEQPACKET,
14610 .raw => SOCK.RAW,
14611 .rdm => if (@hasDecl(SOCK, "RDM")) SOCK.RDM else return error.OptionUnsupported,
1460314612 },
1460414613 if (protocol) |p| @backingInt(p) else if (is_windows) switch (family) {
14605 posix.AF.UNIX => switch (mode) {
14614 AF.UNIX => switch (mode) {
1460614615 .stream => 0,
1460714616 else => return error.ProtocolUnsupportedByAddressFamily,
1460814617 },
14609 posix.AF.INET, posix.AF.INET6 => @backingInt(@as(net.Protocol, switch (mode) {
14618 AF.INET, AF.INET6 => @backingInt(@as(net.Protocol, switch (mode) {
1461014619 .stream => .tcp,
1461114620 .dgram => .udp,
1461214621 else => return error.ProtocolUnsupportedByAddressFamily,
......@@ -17992,7 +18001,7 @@ fn progressParentFile(userdata: ?*anyopaque) std.Progress.ParentFileError!File {
1799218001 return t.environ.zig_progress_file;
1799318002}
1799418003
17995fn inheritParentHandle(handle: posix.fd_t) Io.InheritParentHandleError!void {
18004fn inheritParentHandle(handle: File.Handle) Io.InheritParentHandleError!void {
1799618005 switch (native_os) {
1799718006 .linux,
1799818007 .dragonfly,
lib/std/Io/net.zig+8-3
......@@ -1016,7 +1016,12 @@ pub const Interface = struct {
10161016 pub const Name = struct {
10171017 bytes: [max_len:0]u8,
10181018
1019 pub const max_len = if (@TypeOf(std.posix.IFNAMESIZE) == void) 0 else std.posix.IFNAMESIZE - 1;
1019 pub const max_len = if (native_os == .windows)
1020 std.os.windows.IF.MAX_STRING_SIZE
1021 else if (@TypeOf(std.posix.IFNAMESIZE) == void)
1022 0
1023 else
1024 std.posix.IFNAMESIZE - 1;
10201025
10211026 pub fn toSlice(n: *const Name) []const u8 {
10221027 return std.mem.sliceTo(&n.bytes, 0);
......@@ -1094,7 +1099,7 @@ pub const Socket = struct {
10941099
10951100 /// Underlying platform-defined type which may or may not be
10961101 /// interchangeable with a file system file descriptor.
1097 pub const Handle = std.posix.fd_t;
1102 pub const Handle = if (native_os == .windows) std.os.windows.HANDLE else std.posix.fd_t;
10981103
10991104 /// Leaves `address` in a valid state.
11001105 pub fn close(s: *const Socket, io: Io) void {
......@@ -1517,7 +1522,7 @@ pub const Stream = struct {
15171522 }
15181523};
15191524
1520pub const cmsg_align = if (@TypeOf(std.posix.cmsg_align) == void) 1 else std.posix.cmsg_align;
1525pub const cmsg_align = if (native_os == .windows or @TypeOf(std.posix.cmsg_align) == void) 1 else std.posix.cmsg_align;
15211526/// Utility Functions for interacting with POSIX socket control messages.
15221527/// See also https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_socket.h.html
15231528pub const cmsg = struct {
lib/std/c.zig+74-46
......@@ -12,7 +12,6 @@ const page_size = std.heap.page_size_min;
1212const linux = std.os.linux;
1313const emscripten = std.os.emscripten;
1414const windows = std.os.windows;
15const ws2_32 = std.os.windows.ws2_32;
1615const darwin = @import("c/darwin.zig");
1716const freebsd = @import("c/freebsd.zig");
1817const illumos = @import("c/illumos.zig");
......@@ -79,7 +78,7 @@ pub fn errno(rc: anytype) E {
7978pub const ino_t = switch (native_os) {
8079 .linux => linux.ino_t,
8180 .emscripten => emscripten.ino_t,
82 .windows => windows.LARGE_INTEGER,
81 .windows => c_ushort,
8382 .haiku => i64,
8483 // https://github.com/SerenityOS/serenity/blob/b98f537f117b341788023ab82e0c11ca9ae29a57/Kernel/API/POSIX/sys/types.h#L38
8584 else => u64,
......@@ -138,9 +137,10 @@ pub const dev_t = switch (native_os) {
138137pub const mode_t = switch (native_os) {
139138 .linux => linux.mode_t,
140139 .emscripten => emscripten.mode_t,
141 .openbsd, .haiku, .netbsd, .illumos, .windows => u32,
140 .openbsd, .haiku, .netbsd, .illumos => u32,
142141 // https://github.com/SerenityOS/serenity/blob/b98f537f117b341788023ab82e0c11ca9ae29a57/Kernel/API/POSIX/sys/types.h#L44
143142 .freebsd, .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos, .dragonfly, .serenity => u16,
143 .windows => c_ushort,
144144 else => u0,
145145};
146146
......@@ -149,7 +149,7 @@ pub const nlink_t = switch (native_os) {
149149 .emscripten => emscripten.nlink_t,
150150 // https://github.com/SerenityOS/serenity/blob/b98f537f117b341788023ab82e0c11ca9ae29a57/Kernel/API/POSIX/sys/types.h#L45
151151 .freebsd, .serenity => u64,
152 .openbsd, .netbsd, .dragonfly, .illumos, .windows => u32,
152 .openbsd, .netbsd, .dragonfly, .illumos => u32,
153153 .haiku => i32,
154154 .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => u16,
155155 else => u0,
......@@ -237,9 +237,7 @@ pub const blkcnt_t = switch (native_os) {
237237
238238pub const fd_t = switch (native_os) {
239239 .linux => linux.fd_t,
240 .windows => windows.HANDLE,
241 .serenity => c_int,
242 else => i32,
240 else => c_int,
243241};
244242
245243pub const ARCH = switch (native_os) {
......@@ -445,7 +443,6 @@ pub const E = switch (native_os) {
445443 TIMEDOUT = 138,
446444 TXTBSY = 139,
447445 WOULDBLOCK = 140,
448 DQUOT = 10069,
449446 _,
450447 },
451448 .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => darwin.E,
......@@ -1827,7 +1824,6 @@ pub const PATH_MAX = switch (native_os) {
18271824pub const POLL = switch (native_os) {
18281825 .linux => linux.POLL,
18291826 .emscripten => emscripten.POLL,
1830 .windows => ws2_32.POLL,
18311827 .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => struct {
18321828 pub const IN = 0x001;
18331829 pub const PRI = 0x002;
......@@ -1965,7 +1961,7 @@ pub const PROT = switch (native_os) {
19651961 .linux => linux.PROT,
19661962 .emscripten => emscripten.PROT,
19671963 // https://github.com/SerenityOS/serenity/blob/6d59d4d3d9e76e39112842ec487840828f1c9bfe/Kernel/API/POSIX/sys/mman.h#L28-L31
1968 .openbsd, .haiku, .dragonfly, .netbsd, .illumos, .freebsd, .windows, .serenity => packed struct(u32) {
1964 .openbsd, .haiku, .dragonfly, .netbsd, .illumos, .freebsd, .serenity => packed struct(u32) {
19691965 READ: bool = false,
19701966 WRITE: bool = false,
19711967 EXEC: bool = false,
......@@ -3796,7 +3792,6 @@ pub const T = switch (native_os) {
37963792 else => void,
37973793};
37983794pub const IOCPARM_MASK = switch (native_os) {
3799 .windows => ws2_32.IOCPARM_MASK,
38003795 .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => 0x1fff,
38013796 else => void,
38023797};
......@@ -4448,7 +4443,6 @@ pub const nfds_t = switch (native_os) {
44484443 .linux => linux.nfds_t,
44494444 .emscripten => emscripten.nfds_t,
44504445 .haiku, .illumos => usize,
4451 .windows => c_ulong,
44524446 .openbsd, .dragonfly, .netbsd, .freebsd, .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => u32,
44534447 // https://github.com/SerenityOS/serenity/blob/265764ff2fec038855193296588a887fc322d76a/Kernel/API/POSIX/poll.h#L32
44544448 .serenity => c_uint,
......@@ -4461,15 +4455,13 @@ pub const perf_event_attr = switch (native_os) {
44614455pub const pid_t = switch (native_os) {
44624456 .linux => linux.pid_t,
44634457 .emscripten => emscripten.pid_t,
4464 .windows => windows.HANDLE,
44654458 // https://github.com/SerenityOS/serenity/blob/b98f537f117b341788023ab82e0c11ca9ae29a57/Kernel/API/POSIX/sys/types.h#L31-L32
4466 .serenity => c_int,
4467 else => i32,
4459 else => c_int,
44684460};
44694461pub const pollfd = switch (native_os) {
44704462 .linux => linux.pollfd,
44714463 .emscripten => emscripten.pollfd,
4472 .windows => ws2_32.pollfd,
4464 .windows => void,
44734465 // https://github.com/SerenityOS/serenity/blob/265764ff2fec038855193296588a887fc322d76a/Kernel/API/POSIX/poll.h#L26-L30
44744466 .serenity => extern struct {
44754467 fd: fd_t,
......@@ -4942,7 +4934,6 @@ pub const addrinfo = if (builtin.abi.isAndroid()) extern struct {
49424934 next: ?*addrinfo,
49434935} else switch (native_os) {
49444936 .linux, .emscripten => linux.addrinfo,
4945 .windows => ws2_32.addrinfo,
49464937 .freebsd, .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => extern struct {
49474938 flags: AI,
49484939 family: i32,
......@@ -5008,7 +4999,6 @@ pub const addrinfo = if (builtin.abi.isAndroid()) extern struct {
50084999};
50095000pub const sockaddr = switch (native_os) {
50105001 .linux, .emscripten => linux.sockaddr,
5011 .windows => ws2_32.sockaddr,
50125002 .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => extern struct {
50135003 len: u8,
50145004 family: sa_family_t,
......@@ -5343,14 +5333,13 @@ pub const sockaddr = switch (native_os) {
53435333};
53445334pub const socklen_t = switch (native_os) {
53455335 .linux, .emscripten => linux.socklen_t,
5346 .windows => ws2_32.socklen_t,
5336 .windows => void,
53475337 // https://github.com/SerenityOS/serenity/blob/b98f537f117b341788023ab82e0c11ca9ae29a57/Kernel/API/POSIX/sys/types.h#L57
53485338 else => u32,
53495339};
53505340pub const in_port_t = u16;
53515341pub const sa_family_t = switch (native_os) {
53525342 .linux, .emscripten => linux.sa_family_t,
5353 .windows => ws2_32.ADDRESS_FAMILY,
53545343 .openbsd, .haiku, .dragonfly, .netbsd, .freebsd, .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => u8,
53555344 // https://github.com/SerenityOS/serenity/blob/ac44ec5ebc707f9dd0c3d4759a1e17e91db5d74f/Kernel/API/POSIX/sys/socket.h#L66
53565345 .illumos, .serenity => u16,
......@@ -5403,7 +5392,6 @@ pub const AF = if (builtin.abi.isAndroid()) struct {
54035392 pub const MAX = 43;
54045393} else switch (native_os) {
54055394 .linux, .emscripten => linux.AF,
5406 .windows => ws2_32.AF,
54075395 .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => struct {
54085396 pub const UNSPEC = 0;
54095397 pub const LOCAL = 1;
......@@ -5952,7 +5940,6 @@ pub const DT = switch (native_os) {
59525940pub const MSG = switch (native_os) {
59535941 .linux => linux.MSG,
59545942 .emscripten => emscripten.MSG,
5955 .windows => ws2_32.MSG,
59565943 .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => darwin.MSG,
59575944 .haiku => struct {
59585945 pub const OOB = 0x0001;
......@@ -6069,7 +6056,6 @@ pub const MSG = switch (native_os) {
60696056pub const SOCK = switch (native_os) {
60706057 .linux => linux.SOCK,
60716058 .emscripten => emscripten.SOCK,
6072 .windows => ws2_32.SOCK,
60736059 .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => struct {
60746060 pub const STREAM = 1;
60756061 pub const DGRAM = 2;
......@@ -6178,7 +6164,6 @@ pub const TCP = switch (native_os) {
61786164 .openbsd => openbsd.TCP,
61796165 .dragonfly => dragonfly.TCP,
61806166 .emscripten => emscripten.TCP,
6181 .windows => ws2_32.TCP,
61826167 .illumos => illumos.TCP,
61836168 .haiku => haiku.TCP,
61846169 // https://github.com/SerenityOS/serenity/blob/61ac554a3403838f79ca746bd1c65ded6f97d124/Kernel/API/POSIX/netinet/tcp.h#L13-L14
......@@ -6190,7 +6175,6 @@ pub const TCP = switch (native_os) {
61906175};
61916176pub const IPPROTO = switch (native_os) {
61926177 .linux, .emscripten => linux.IPPROTO,
6193 .windows => ws2_32.IPPROTO,
61946178 .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => struct {
61956179 pub const ICMP = 1;
61966180 pub const ICMPV6 = 58;
......@@ -6826,7 +6810,6 @@ pub const IPTOS = switch (native_os) {
68266810pub const SOL = switch (native_os) {
68276811 .linux => linux.SOL,
68286812 .emscripten => emscripten.SOL,
6829 .windows => ws2_32.SOL,
68306813 .openbsd, .haiku, .dragonfly, .netbsd, .freebsd, .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => struct {
68316814 pub const SOCKET = 0xffff;
68326815 },
......@@ -6845,7 +6828,6 @@ pub const SOL = switch (native_os) {
68456828pub const SO = switch (native_os) {
68466829 .linux => linux.SO,
68476830 .emscripten => emscripten.SO,
6848 .windows => ws2_32.SO,
68496831 .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => struct {
68506832 pub const DEBUG = 0x0001;
68516833 pub const ACCEPTCONN = 0x0002;
......@@ -7084,7 +7066,6 @@ pub const SO = switch (native_os) {
70847066};
70857067pub const SOMAXCONN = switch (native_os) {
70867068 .linux => linux.SOMAXCONN,
7087 .windows => ws2_32.SOMAXCONN,
70887069 // https://github.com/SerenityOS/serenity/blob/ac44ec5ebc707f9dd0c3d4759a1e17e91db5d74f/Kernel/API/POSIX/sys/socket.h#L128
70897070 .illumos, .serenity => 128,
70907071 // https://github.com/freebsd/freebsd-src/blob/9ab31f821ad1c6bad474510447387c50bef2c24c/sys/sys/socket.h#L434
......@@ -7153,7 +7134,6 @@ pub const SCM = switch (native_os) {
71537134pub const IFNAMESIZE = switch (native_os) {
71547135 .linux => linux.IFNAMESIZE,
71557136 .emscripten => emscripten.IFNAMESIZE,
7156 .windows => 30,
71577137 // https://github.com/SerenityOS/serenity/blob/9882848e0bf783dfc8e8a6d887a848d70d9c58f4/Kernel/API/POSIX/net/if.h#L50
71587138 .openbsd, .dragonfly, .netbsd, .freebsd, .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos, .serenity => 16,
71597139 .illumos => 32,
......@@ -7532,7 +7512,6 @@ pub const AI = if (builtin.abi.isAndroid()) packed struct(u32) {
75327512 NUMERICSERV: bool = false,
75337513 _: u19 = 0,
75347514 },
7535 .windows => ws2_32.AI,
75367515 // https://github.com/SerenityOS/serenity/blob/d510d2aeb2facbd8f6c383d70fd1b033e1fee5dd/Userland/Libraries/LibC/netdb.h#L90-L96
75377516 .serenity => packed struct(c_int) {
75387517 PASSIVE: bool = false,
......@@ -8379,10 +8358,6 @@ pub const port_event = switch (native_os) {
83798358
83808359pub const AT = switch (native_os) {
83818360 .linux => linux.AT,
8382 .windows => struct {
8383 /// Remove directory instead of unlinking file
8384 pub const REMOVEDIR = 0x200;
8385 },
83868361 .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => struct {
83878362 pub const FDCWD = -2;
83888363 /// Use effective ids in access check
......@@ -10436,6 +10411,7 @@ pub extern "c" fn alarm(seconds: c_uint) c_uint;
1043610411
1043710412pub const close = switch (native_os) {
1043810413 .driverkit, .ios, .maccatalyst, .macos, .tvos, .visionos, .watchos => darwin.@"close$NOCANCEL",
10414 .windows => private._close,
1043910415 else => private.close,
1044010416};
1044110417
......@@ -10922,19 +10898,31 @@ pub extern "c" fn abort() noreturn;
1092210898pub extern "c" fn exit(code: c_int) noreturn;
1092310899pub extern "c" fn _Exit(code: c_int) noreturn;
1092410900pub extern "c" fn _exit(code: c_int) noreturn;
10925pub extern "c" fn isatty(fd: fd_t) c_int;
10926pub extern "c" fn lseek(fd: fd_t, offset: off_t, whence: whence_t) off_t;
10901pub const isatty = switch (native_os) {
10902 .windows => private._isatty,
10903 else => private.isatty,
10904};
10905pub const lseek = switch (native_os) {
10906 .windows => private._lseeki64,
10907 else => private.lseek,
10908};
1092710909pub extern "c" fn open(path: [*:0]const u8, oflag: O, ...) c_int;
1092810910pub extern "c" fn openat(fd: c_int, path: [*:0]const u8, oflag: O, ...) c_int;
1092910911pub extern "c" fn ftruncate(fd: c_int, length: off_t) c_int;
1093010912pub extern "c" fn raise(sig: SIG) c_int;
10931pub extern "c" fn read(fd: fd_t, buf: [*]u8, nbyte: usize) isize;
10913pub const read = switch (native_os) {
10914 .windows => private._read,
10915 else => private.read,
10916};
1093210917pub extern "c" fn readv(fd: c_int, iov: [*]const iovec, iovcnt: c_uint) isize;
1093310918pub extern "c" fn pread(fd: fd_t, buf: [*]u8, nbyte: usize, offset: off_t) isize;
1093410919pub extern "c" fn preadv(fd: c_int, iov: [*]const iovec, iovcnt: c_uint, offset: off_t) isize;
1093510920pub extern "c" fn writev(fd: c_int, iov: [*]const iovec_const, iovcnt: c_uint) isize;
1093610921pub extern "c" fn pwritev(fd: c_int, iov: [*]const iovec_const, iovcnt: c_uint, offset: off_t) isize;
10937pub extern "c" fn write(fd: fd_t, buf: [*]const u8, nbyte: usize) isize;
10922pub const write = switch (native_os) {
10923 .windows => private._write,
10924 else => private.write,
10925};
1093810926pub extern "c" fn pwrite(fd: fd_t, buf: [*]const u8, nbyte: usize, offset: off_t) isize;
1093910927pub extern "c" fn mmap(addr: ?*align(page_size) anyopaque, len: usize, prot: PROT, flags: MAP, fd: fd_t, offset: off_t) *anyopaque;
1094010928pub extern "c" fn munmap(addr: *align(page_size) const anyopaque, len: usize) c_int;
......@@ -10977,7 +10965,10 @@ pub const fork = switch (native_os) {
1097710965pub extern "c" fn access(path: [*:0]const u8, mode: c_uint) c_int;
1097810966pub extern "c" fn faccessat(dirfd: fd_t, path: [*:0]const u8, mode: c_uint, flags: c_uint) c_int;
1097910967pub extern "c" fn pipe(fds: *[2]fd_t) c_int;
10980pub extern "c" fn mkdir(path: [*:0]const u8, mode: mode_t) c_int;
10968pub const mkdir = switch (native_os) {
10969 .windows => private._mkdir,
10970 else => private.mkdir,
10971};
1098110972pub extern "c" fn mkdirat(dirfd: fd_t, path: [*:0]const u8, mode: mode_t) c_int;
1098210973pub extern "c" fn symlink(existing: [*:0]const u8, new: [*:0]const u8) c_int;
1098310974pub extern "c" fn symlinkat(oldpath: [*:0]const u8, newdirfd: fd_t, newpath: [*:0]const u8) c_int;
......@@ -10991,17 +10982,29 @@ pub const fexecve = switch (native_os) {
1099110982};
1099210983pub extern "c" fn execve(path: [*:0]const u8, argv: [*:null]const ?[*:0]const u8, envp: [*:null]const ?[*:0]const u8) c_int;
1099310984pub extern "c" fn execveat(dirfd: fd_t, path: [*:0]const u8, argv: [*:null]const ?[*:0]const u8, envp: [*:null]const ?[*:0]const u8, flags: EXECVEAT) c_int;
10994pub extern "c" fn dup(fd: fd_t) c_int;
10995pub extern "c" fn dup2(old_fd: fd_t, new_fd: fd_t) c_int;
10985pub const dup = switch (native_os) {
10986 .windows => private._dup,
10987 else => private.dup,
10988};
10989pub const dup2 = switch (native_os) {
10990 .windows => private._dup2,
10991 else => private.dup2,
10992};
1099610993pub extern "c" fn dup3(old: c_int, new: c_int, flags: c_uint) c_int;
1099710994pub extern "c" fn readlink(noalias path: [*:0]const u8, noalias buf: [*]u8, bufsize: usize) isize;
1099810995pub extern "c" fn readlinkat(dirfd: fd_t, noalias path: [*:0]const u8, noalias buf: [*]u8, bufsize: usize) isize;
10999pub extern "c" fn chmod(path: [*:0]const u8, mode: mode_t) c_int;
10996pub const chmod = switch (native_os) {
10997 .windows => private._chmod,
10998 else => private.chmod,
10999};
1100011000pub extern "c" fn fchmod(fd: fd_t, mode: mode_t) c_int;
1100111001pub extern "c" fn fchmodat(fd: fd_t, path: [*:0]const u8, mode: mode_t, flags: c_uint) c_int;
1100211002pub extern "c" fn fchown(fd: fd_t, owner: uid_t, group: gid_t) c_int;
1100311003pub extern "c" fn fchownat(fd: fd_t, path: [*:0]const u8, owner: uid_t, group: gid_t, flags: c_uint) c_int;
11004pub extern "c" fn umask(mode: mode_t) mode_t;
11004pub const umask = switch (native_os) {
11005 .windows => private._umask,
11006 else => private.umask,
11007};
1100511008
1100611009pub extern "c" fn rmdir(path: [*:0]const u8) c_int;
1100711010pub extern "c" fn getenv(name: [*:0]const u8) ?[*:0]u8;
......@@ -11044,7 +11047,7 @@ pub extern "c" fn recv(
1104411047 arg1: ?*anyopaque,
1104511048 arg2: usize,
1104611049 arg3: c_int,
11047) if (native_os == .windows) c_int else isize;
11050) isize;
1104811051pub extern "c" fn recvfrom(
1104911052 sockfd: fd_t,
1105011053 noalias buf: *anyopaque,
......@@ -11052,7 +11055,7 @@ pub extern "c" fn recvfrom(
1105211055 flags: u32,
1105311056 noalias src_addr: ?*sockaddr,
1105411057 noalias addrlen: ?*socklen_t,
11055) if (native_os == .windows) c_int else isize;
11058) isize;
1105611059
1105711060pub const recvmsg = switch (native_os) {
1105811061 .windows => {},
......@@ -11319,7 +11322,10 @@ pub extern "c" fn setlogmask(maskpri: c_int) c_int;
1131911322
1132011323pub extern "c" fn if_nametoindex([*:0]const u8) c_int;
1132111324
11322pub extern "c" fn getpid() pid_t;
11325pub const getpid = switch (native_os) {
11326 .windows => private._getpid,
11327 else => private.getpid,
11328};
1132311329pub extern "c" fn getppid() pid_t;
1132411330pub extern "c" fn setsid() pid_t;
1132511331
......@@ -11882,11 +11888,14 @@ const private = struct {
1188211888 extern "c" fn swab(noalias from: *const anyopaque, noalias to: *anyopaque, n: isize) void;
1188311889 extern "c" fn _swab(noalias from: *const anyopaque, noalias to: *anyopaque, n: isize) void;
1188411890
11891 extern "c" fn chmod(path: [*:0]const u8, mode: mode_t) c_int;
1188511892 extern "c" fn clock_getres(clk_id: clockid_t, tp: *timespec) c_int;
1188611893 extern "c" fn clock_gettime(clk_id: clockid_t, tp: *timespec) c_int;
1188711894 extern "c" fn clock_nanosleep(clockid: clockid_t, flags: TIMER, t: *const timespec, remain: ?*timespec) c_int;
1188811895 extern "c" fn close(fd: fd_t) c_int;
1188911896 extern "c" fn copy_file_range(fd_in: fd_t, off_in: ?*i64, fd_out: fd_t, off_out: ?*i64, len: usize, flags: c_uint) isize;
11897 extern "c" fn dup(fd: fd_t) c_int;
11898 extern "c" fn dup2(old_fd: fd_t, new_fd: fd_t) c_int;
1189011899 extern "c" fn fexecve(fd: fd_t, argv: [*:null]const ?[*:0]const u8, envp: [*:null]const ?[*:0]const u8) c_int;
1189111900 extern "c" fn flock(fd: fd_t, operation: c_int) c_int;
1189211901 extern "c" fn fork() c_int;
......@@ -11898,13 +11907,18 @@ const private = struct {
1189811907 .freebsd => isize,
1189911908 .illumos => usize,
1190011909 };
11910 extern "c" fn getpid() pid_t;
1190111911 extern "c" fn getrusage(who: c_int, usage: *rusage) c_int;
1190211912 extern "c" fn gettimeofday(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;
1190311913 extern "c" fn ioctl(fd: fd_t, request: c_int, ...) c_int;
11914 extern "c" fn isatty(fd: fd_t) c_int;
11915 extern "c" fn lseek(fd: fd_t, offset: off_t, whence: whence_t) off_t;
11916 extern "c" fn mkdir(path: [*:0]const u8, mode: mode_t) c_int;
1190411917 extern "c" fn msync(addr: *align(page_size) const anyopaque, len: usize, flags: c_int) c_int;
1190511918 extern "c" fn mremap(addr: ?*align(page_size) const anyopaque, old_len: usize, new_len: usize, flags: MREMAP, ...) *anyopaque;
1190611919 extern "c" fn nanosleep(rqtp: *const timespec, rmtp: ?*timespec) c_int;
1190711920 extern "c" fn pipe2(fds: *[2]fd_t, flags: O) c_int;
11921 extern "c" fn read(fd: fd_t, buf: [*]u8, nbyte: usize) isize;
1190811922 extern "c" fn readdir(dir: *DIR) ?*dirent;
1190911923 extern "c" fn realpath(noalias file_name: [*:0]const u8, noalias resolved_name: [*]u8) ?[*:0]u8;
1191011924 extern "c" fn recvmsg(sockfd: fd_t, msg: *msghdr, flags: u32) isize;
......@@ -11932,7 +11946,21 @@ const private = struct {
1193211946 extern "c" fn sigaltstack(ss: ?*const stack_t, old_ss: ?*stack_t) c_int;
1193311947 extern "c" fn sysconf(sc: c_int) c_long;
1193411948 extern "c" fn shm_open(name: [*:0]const u8, flag: c_int, mode: mode_t) c_int;
11949 extern "c" fn umask(mode: mode_t) mode_t;
1193511950 extern "c" fn wait4(pid: pid_t, status: ?*c_int, options: c_int, ru: ?*rusage) pid_t;
11951 extern "c" fn write(fd: fd_t, buf: [*]const u8, nbyte: usize) isize;
11952
11953 extern "c" fn _chmod(filename: [*:0]const u8, pmode: c_int) c_int;
11954 extern "c" fn _close(fd: fd_t) c_int;
11955 extern "c" fn _dup(fd: fd_t) c_int;
11956 extern "c" fn _dup2(old_fd: fd_t, new_fd: fd_t) c_int;
11957 extern "c" fn _getpid() pid_t;
11958 extern "c" fn _isatty(fd: fd_t) c_int;
11959 extern "c" fn _lseeki64(fd: fd_t, offset: off_t, whence: whence_t) off_t;
11960 extern "c" fn _mkdir(dirname: [*:0]const u8) c_int;
11961 extern "c" fn _read(fd: fd_t, buf: [*]u8, nbyte: c_uint) c_int;
11962 extern "c" fn _umask(pmode: c_int) c_int;
11963 extern "c" fn _write(fd: fd_t, buf: [*]const u8, nbyte: c_uint) c_int;
1193611964
1193711965 extern "c" fn pthread_setname_np(thread: pthread_t, name: [*:0]const u8) c_int;
1193811966
lib/std/crypto/Certificate/Bundle.zig+1-1
......@@ -144,7 +144,7 @@ fn rescanWithPath(cb: *Bundle, gpa: Allocator, io: Io, now: Io.Timestamp, cert_f
144144 cb.bytes.shrinkAndFree(gpa, cb.bytes.items.len);
145145}
146146
147const RescanWindowsError = Allocator.Error || ParseCertError || std.posix.UnexpectedError || error{FileNotFound};
147const RescanWindowsError = Allocator.Error || ParseCertError || std.Io.UnexpectedError || error{FileNotFound};
148148
149149fn rescanWindows(cb: *Bundle, gpa: Allocator, io: Io, now: Io.Timestamp) RescanWindowsError!void {
150150 cb.bytes.clearRetainingCapacity();
lib/std/os/windows.zig+5-1
......@@ -13,7 +13,7 @@ const mem = std.mem;
1313const assert = std.debug.assert;
1414const math = std.math;
1515const maxInt = std.math.maxInt;
16const UnexpectedError = std.posix.UnexpectedError;
16const UnexpectedError = std.Io.UnexpectedError;
1717
1818pub const kernel32 = @import("windows/kernel32.zig");
1919pub const ntdll = @import("windows/ntdll.zig");
......@@ -1492,6 +1492,10 @@ pub const TDI = struct {
14921492 };
14931493};
14941494
1495pub const IF = struct {
1496 pub const MAX_STRING_SIZE = 256;
1497};
1498
14951499pub const NET = struct {
14961500 pub const LUID = packed struct(ULONG64) { Reserved: u24 = 0, Index: u24, IfType: u16 };
14971501 pub const IFINDEX = enum(ULONG) { _ };
lib/std/posix.zig+33-57
......@@ -5,7 +5,7 @@
55//! `std.process`.
66//!
77//! These APIs are generally lowered to libc function calls if and only if libc
8//! is linked. Most operating systems other than Windows, Linux, and WASI
8//! is linked. Most operating systems other than Linux and WASI
99//! require always linking libc because they use it as the stable syscall ABI.
1010const builtin = @import("builtin");
1111const native_os = builtin.os.tag;
......@@ -19,21 +19,19 @@ const assert = std.debug.assert;
1919const page_size_min = std.heap.page_size_min;
2020
2121test {
22 _ = @import("posix/test.zig");
22 if (native_os != .windows) _ = @import("posix/test.zig");
2323}
2424
2525/// Whether to use libc for the POSIX API layer.
26const use_libc = builtin.link_libc or switch (native_os) {
27 .windows => true,
28 else => false,
29};
26const use_libc = builtin.link_libc;
3027
3128const linux = std.os.linux;
32const windows = std.os.windows;
3329const wasi = std.os.wasi;
3430
3531/// A libc-compatible API layer.
36pub const system = if (use_libc)
32pub const system = if (native_os == .windows)
33 @compileError("Windows does not support POSIX")
34else if (use_libc)
3735 std.c
3836else switch (native_os) {
3937 .linux => linux,
......@@ -134,14 +132,11 @@ pub const STDIN_FILENO = system.STDIN_FILENO;
134132pub const STDOUT_FILENO = system.STDOUT_FILENO;
135133pub const SYS = system.SYS;
136134pub const Sigaction = system.Sigaction;
137/// Windows has no concept of `stat`.
138///
139135/// On Linux, the `stat` bits/wrappers are removed due to having to maintain
140136/// the different varying stat structs per target and libc, leading to runtime
141137/// errors. Users targeting Linux should add a comptime check and use statx,
142138/// similar to how `Io.File.stat` does.
143139pub const Stat = switch (native_os) {
144 .windows => void,
145140 .linux => void,
146141 else => system.Stat,
147142};
......@@ -406,7 +401,6 @@ pub const ReadError = std.Io.File.Reader.Error;
406401/// The corresponding POSIX limit is `maxInt(isize)`.
407402pub fn read(fd: fd_t, buf: []u8) ReadError!usize {
408403 if (buf.len == 0) return 0;
409 if (native_os == .windows) @compileError("unsupported OS");
410404 if (native_os == .wasi) @compileError("unsupported OS");
411405
412406 // Prevents EINVAL.
......@@ -441,14 +435,11 @@ pub const OpenError = std.Io.File.OpenError || error{WouldBlock};
441435
442436/// Open and possibly create a file. Keeps trying if it gets interrupted.
443437/// `file_path` is relative to the open directory handle `dir_fd`.
444/// On Windows, `file_path` should be encoded as [WTF-8](https://wtf-8.codeberg.page/).
445438/// On WASI, `file_path` should be encoded as valid UTF-8.
446439/// On other platforms, `file_path` is an opaque sequence of bytes with no particular encoding.
447440/// See also `openatZ`.
448441pub fn openat(dir_fd: fd_t, file_path: []const u8, flags: O, mode: mode_t) OpenError!fd_t {
449 if (native_os == .windows) {
450 @compileError("Windows does not support POSIX; use Windows-specific API or cross-platform std.fs API");
451 } else if (native_os == .wasi) {
442 if (native_os == .wasi) {
452443 @compileError("use std.Io instead");
453444 }
454445 const file_path_c = try toPosixPath(file_path);
......@@ -457,14 +448,11 @@ pub fn openat(dir_fd: fd_t, file_path: []const u8, flags: O, mode: mode_t) OpenE
457448
458449/// Open and possibly create a file. Keeps trying if it gets interrupted.
459450/// `file_path` is relative to the open directory handle `dir_fd`.
460/// On Windows, `file_path` should be encoded as [WTF-8](https://wtf-8.codeberg.page/).
461451/// On WASI, `file_path` should be encoded as valid UTF-8.
462452/// On other platforms, `file_path` is an opaque sequence of bytes with no particular encoding.
463453/// See also `openat`.
464454pub fn openatZ(dir_fd: fd_t, file_path: [*:0]const u8, flags: O, mode: mode_t) OpenError!fd_t {
465 if (native_os == .windows) {
466 @compileError("Windows does not support POSIX; use Windows-specific API or cross-platform std.fs API");
467 } else if (native_os == .wasi) {
455 if (native_os == .wasi) {
468456 return openat(dir_fd, mem.sliceTo(file_path, 0), flags, mode);
469457 }
470458
......@@ -526,21 +514,17 @@ pub const GetSockNameError = error{
526514} || UnexpectedError;
527515
528516pub fn getpeername(sock: socket_t, addr: *sockaddr, addrlen: *socklen_t) GetSockNameError!void {
529 if (native_os == .windows) {
530 @compileError("use std.Io instead");
531 } else {
532 const rc = system.getpeername(sock, addr, addrlen);
533 switch (errno(rc)) {
534 .SUCCESS => return,
535 else => |err| return unexpectedErrno(err),
517 const rc = system.getpeername(sock, addr, addrlen);
518 switch (errno(rc)) {
519 .SUCCESS => return,
520 else => |err| return unexpectedErrno(err),
536521
537 .BADF => unreachable, // always a race condition
538 .FAULT => unreachable,
539 .INVAL => unreachable, // invalid parameters
540 .NOTSOCK => return error.FileDescriptorNotASocket,
541 .NOBUFS => return error.SystemResources,
542 .NOTCONN => return error.SocketUnconnected,
543 }
522 .BADF => unreachable, // always a race condition
523 .FAULT => unreachable,
524 .INVAL => unreachable, // invalid parameters
525 .NOTSOCK => return error.FileDescriptorNotASocket,
526 .NOBUFS => return error.SystemResources,
527 .NOTCONN => return error.SocketUnconnected,
544528 }
545529}
546530
......@@ -1008,9 +992,6 @@ pub const PollError = error{
1008992} || UnexpectedError;
1009993
1010994pub fn poll(fds: []pollfd, timeout: i32) PollError!usize {
1011 if (native_os == .windows) {
1012 @compileError("use std.Io instead");
1013 }
1014995 while (true) {
1015996 const fds_count = cast(nfds_t, fds.len) orelse return error.SystemResources;
1016997 const rc = system.poll(fds.ptr, fds_count, timeout);
......@@ -1078,25 +1059,21 @@ pub const SetSockOptError = error{
10781059
10791060/// Set a socket's options.
10801061pub fn setsockopt(fd: socket_t, level: i32, optname: u32, opt: []const u8) SetSockOptError!void {
1081 if (native_os == .windows) {
1082 @compileError("use std.Io instead");
1083 } else {
1084 switch (errno(system.setsockopt(fd, level, optname, opt.ptr, @intCast(opt.len)))) {
1085 .SUCCESS => {},
1086 .BADF => unreachable, // always a race condition
1087 .NOTSOCK => unreachable, // always a race condition
1088 .INVAL => unreachable,
1089 .FAULT => unreachable,
1090 .DOM => return error.TimeoutTooBig,
1091 .ISCONN => return error.AlreadyConnected,
1092 .NOPROTOOPT => return error.InvalidProtocolOption,
1093 .NOMEM => return error.SystemResources,
1094 .NOBUFS => return error.SystemResources,
1095 .PERM => return error.PermissionDenied,
1096 .NODEV => return error.NoDevice,
1097 .OPNOTSUPP => return error.OperationUnsupported,
1098 else => |err| return unexpectedErrno(err),
1099 }
1062 switch (errno(system.setsockopt(fd, level, optname, opt.ptr, @intCast(opt.len)))) {
1063 .SUCCESS => {},
1064 .BADF => unreachable, // always a race condition
1065 .NOTSOCK => unreachable, // always a race condition
1066 .INVAL => unreachable,
1067 .FAULT => unreachable,
1068 .DOM => return error.TimeoutTooBig,
1069 .ISCONN => return error.AlreadyConnected,
1070 .NOPROTOOPT => return error.InvalidProtocolOption,
1071 .NOMEM => return error.SystemResources,
1072 .NOBUFS => return error.SystemResources,
1073 .PERM => return error.PermissionDenied,
1074 .NODEV => return error.NoDevice,
1075 .OPNOTSUPP => return error.OperationUnsupported,
1076 else => |err| return unexpectedErrno(err),
11001077 }
11011078}
11021079
......@@ -1527,7 +1504,6 @@ pub const PtraceError = error{
15271504
15281505pub fn ptrace(request: u32, pid: pid_t, addr: usize, data: usize) PtraceError!void {
15291506 return switch (native_os) {
1530 .windows,
15311507 .wasi,
15321508 .emscripten,
15331509 .haiku,
lib/std/posix/test.zig+11-14
......@@ -36,19 +36,19 @@ test "check WASI CWD" {
3636}
3737
3838test "getuid" {
39 if (native_os == .windows or native_os == .wasi) return error.SkipZigTest;
39 if (native_os == .wasi) return error.SkipZigTest;
4040 _ = posix.system.getuid();
4141 _ = posix.system.geteuid();
4242}
4343
4444test "getgid" {
45 if (native_os == .windows or native_os == .wasi) return error.SkipZigTest;
45 if (native_os == .wasi) return error.SkipZigTest;
4646 _ = posix.system.getgid();
4747 _ = posix.system.getegid();
4848}
4949
5050test "sigaltstack" {
51 if (native_os == .windows or native_os == .wasi) return error.SkipZigTest;
51 if (native_os == .wasi) return error.SkipZigTest;
5252
5353 var st: posix.stack_t = undefined;
5454 try posix.sigaltstack(null, &st);
......@@ -102,7 +102,7 @@ test "dl_iterate_phdr" {
102102}
103103
104104test "gethostname" {
105 if (native_os == .windows or native_os == .wasi)
105 if (native_os == .wasi)
106106 return error.SkipZigTest;
107107
108108 var buf: [posix.HOST_NAME_MAX]u8 = undefined;
......@@ -111,7 +111,7 @@ test "gethostname" {
111111}
112112
113113test "pipe" {
114 if (native_os == .windows or native_os == .wasi)
114 if (native_os == .wasi)
115115 return error.SkipZigTest;
116116
117117 const io = testing.io;
......@@ -155,7 +155,7 @@ test "memfd_create" {
155155}
156156
157157test "mmap" {
158 if (native_os == .windows or native_os == .wasi)
158 if (native_os == .wasi)
159159 return error.SkipZigTest;
160160
161161 const io = testing.io;
......@@ -252,7 +252,7 @@ test "mmap" {
252252}
253253
254254test "fcntl" {
255 if (native_os == .windows or native_os == .wasi)
255 if (native_os == .wasi)
256256 return error.SkipZigTest;
257257
258258 const io = testing.io;
......@@ -351,7 +351,7 @@ test "getrlimit and setrlimit" {
351351
352352test "sigrtmin/max" {
353353 if (native_os.isDarwin() or switch (native_os) {
354 .wasi, .windows, .openbsd, .dragonfly => true,
354 .wasi, .openbsd, .dragonfly => true,
355355 else => false,
356356 }) return error.SkipZigTest;
357357
......@@ -361,7 +361,7 @@ test "sigrtmin/max" {
361361}
362362
363363test "sigset empty/full" {
364 if (native_os == .wasi or native_os == .windows)
364 if (native_os == .wasi)
365365 return error.SkipZigTest;
366366
367367 var set: posix.sigset_t = posix.sigemptyset();
......@@ -389,7 +389,7 @@ fn reserved_signo(i: usize) bool {
389389}
390390
391391test "sigset add/del" {
392 if (native_os == .wasi or native_os == .windows)
392 if (native_os == .wasi)
393393 return error.SkipZigTest;
394394
395395 var sigset: posix.sigset_t = posix.sigemptyset();
......@@ -426,21 +426,18 @@ test "sigset add/del" {
426426
427427test "getpid" {
428428 if (native_os == .wasi) return error.SkipZigTest;
429 if (native_os == .windows) return error.SkipZigTest;
430429
431430 try expect(posix.system.getpid() != 0);
432431}
433432
434433test "getppid" {
435434 if (native_os == .wasi) return error.SkipZigTest;
436 if (native_os == .windows) return error.SkipZigTest;
437435 if (native_os == .plan9 and !builtin.link_libc) return error.SkipZigTest;
438436
439437 try expect(posix.getppid() >= 0);
440438}
441439
442440test "rename smoke test" {
443 if (native_os == .windows) return error.SkipZigTest;
444441 if (!fstest.isRealPathSupported()) return error.SkipZigTest;
445442
446443 const io = testing.io;
......@@ -452,7 +449,7 @@ test "rename smoke test" {
452449 const base_path = try tmp.dir.realPathFileAlloc(io, ".", gpa);
453450 defer gpa.free(base_path);
454451
455 const mode: posix.mode_t = if (native_os == .windows) 0 else 0o666;
452 const mode: posix.mode_t = 0o666;
456453
457454 {
458455 // Create some file using `open`.
lib/std/process.zig+14-7
......@@ -415,12 +415,12 @@ pub const SpawnOptions = struct {
415415 /// On Linux and Darwin, this obtains rusage statistics from wait4().
416416 request_resource_usage_statistics: bool = false,
417417
418 /// Set to change the user id when spawning the child process.
419 uid: ?posix.uid_t = null,
420 /// Set to change the group id when spawning the child process.
421 gid: ?posix.gid_t = null,
422 /// Set to change the process group id when spawning the child process.
423 pgid: ?posix.pid_t = null,
418 /// Set to change the user id when spawning the child process. Unsupported on Windows.
419 uid: ?File.Uid = null,
420 /// Set to change the group id when spawning the child process. Unsupported on Windows.
421 gid: ?File.Gid = null,
422 /// Set to change the process group id when spawning the child process. Unsupported on Windows.
423 pgid: ?Child.Id = null,
424424
425425 /// Start child process in suspended state.
426426 /// For Posix systems it's started as if SIGSTOP was sent.
......@@ -656,7 +656,7 @@ pub fn cleanExit(io: Io) void {
656656/// On some systems, this raises the limit before seeing ProcessFdQuotaExceeded
657657/// errors. On other systems, this does nothing.
658658pub fn raiseFileDescriptorLimit() void {
659 const have_rlimit = posix.rlimit_resource != void;
659 const have_rlimit = native_os != .windows and posix.rlimit_resource != void;
660660 if (!have_rlimit) return;
661661
662662 var lim = posix.getrlimit(.NOFILE) catch return; // Oh well; we tried.
......@@ -964,6 +964,7 @@ pub const LockMemoryOptions = struct {
964964pub fn lockMemory(memory: []align(std.heap.page_size_min) const u8, options: LockMemoryOptions) LockMemoryError!void {
965965 if (native_os == .windows) {
966966 // TODO call VirtualLock
967 return;
967968 }
968969 if (!options.on_fault and @TypeOf(posix.system.mlock) != void) {
969970 switch (posix.errno(posix.system.mlock(memory.ptr, memory.len))) {
......@@ -1002,6 +1003,10 @@ pub const UnlockMemoryError = error{
10021003/// See also:
10031004/// * `lockMemory`
10041005pub fn unlockMemory(memory: []align(std.heap.page_size_min) const u8) UnlockMemoryError!void {
1006 if (native_os == .windows) {
1007 // TODO call VirtualUnlock
1008 return;
1009 }
10051010 if (@TypeOf(posix.system.munlock) == void) return;
10061011 switch (posix.errno(posix.system.munlock(memory.ptr, memory.len))) {
10071012 .SUCCESS => return,
......@@ -1021,6 +1026,7 @@ pub const LockMemoryAllOptions = struct {
10211026};
10221027
10231028pub fn lockMemoryAll(options: LockMemoryAllOptions) LockMemoryError!void {
1029 if (native_os == .windows) return;
10241030 if (@TypeOf(posix.system.mlockall) == void) return error.UnsupportedOperation;
10251031 var flags: posix.MCL = .{
10261032 .CURRENT = options.current,
......@@ -1045,6 +1051,7 @@ pub fn lockMemoryAll(options: LockMemoryAllOptions) LockMemoryError!void {
10451051}
10461052
10471053pub fn unlockMemoryAll() UnlockMemoryError!void {
1054 if (native_os == .windows) return;
10481055 if (@TypeOf(posix.system.munlockall) == void) return;
10491056 switch (posix.errno(posix.system.munlockall())) {
10501057 .SUCCESS => return,
lib/std/process/Args.zig+1-1
......@@ -372,7 +372,7 @@ pub const Iterator = struct {
372372 index: usize,
373373 args: [][:0]u8,
374374
375 pub const InitError = error{OutOfMemory} || std.posix.UnexpectedError;
375 pub const InitError = error{OutOfMemory} || std.Io.UnexpectedError;
376376
377377 /// You must call deinit to free the internal buffer of the
378378 /// iterator after you are done.
lib/std/process/Child.zig+5-2
......@@ -93,10 +93,13 @@ pub const ResourceUsageStatistics = struct {
9393
9494pub const Term = union(enum) {
9595 exited: u8,
96 signal: std.posix.SIG,
97 stopped: std.posix.SIG,
96 signal: Signal,
97 stopped: Signal,
9898 unknown: u32,
9999
100 // This probably needs some more thought for Windows.
101 const Signal = if (native_os == .windows) std.c.SIG else std.posix.SIG;
102
100103 pub fn success(t: Term) bool {
101104 return switch (t) {
102105 .exited => |code| code == 0,
src/link/MachO.zig+2-2
......@@ -4438,7 +4438,7 @@ pub const MachError = error{
44384438 /// Not enough permissions held to perform the requested kernel
44394439 /// call.
44404440 PermissionDenied,
4441} || std.posix.UnexpectedError;
4441} || std.Io.UnexpectedError;
44424442
44434443pub const MachTask = extern struct {
44444444 port: std.c.mach_port_name_t,
......@@ -4906,7 +4906,7 @@ pub fn getKernError(err: std.c.kern_return_t) KernE {
49064906 return @as(KernE, @fromBackingInt(@intCast(@as(u32, @truncate(@as(usize, @intCast(err)))))));
49074907}
49084908
4909pub fn unexpectedKernError(err: KernE) std.posix.UnexpectedError {
4909pub fn unexpectedKernError(err: KernE) std.Io.UnexpectedError {
49104910 if (std.options.unexpected_error_tracing) {
49114911 std.debug.print("unexpected error: {d}\n", .{@backingInt(err)});
49124912 std.debug.dumpCurrentStackTrace(.{});