Commit 0c6ab61b228211398841cf11912c7252362009b7 | zig

build.zig+2-4

 @@ -166,10 +166,8 @@ fn dependOnLib(b: *Builder, lib_exe_obj: var, dep: LibraryDep) void {
 }
 fn fileExists(filename: []const u8) !bool {
-    fs.File.exists(filename) catch |err| switch (err) {
+    fs.File.access(filename) catch |err| switch (err) {
-        error.PermissionDenied,
+        error.FileNotFound => return false,
-        error.FileNotFound,
-        => return false,
         else => return err,
     };
     return true;

doc/langref.html.in+2-2

...	@@ -796,8 +796,8 @@ const assert = std.debug.assert;	...	@@ -796,8 +796,8 @@ const assert = std.debug.assert;
796	threadlocal var x: i32 = 1234;	796	threadlocal var x: i32 = 1234;
797		797
798	test "thread local storage" {	798	test "thread local storage" {
799	const thread1 = try std.os.spawnThread({}, testTls);	799	const thread1 = try std.Thread.spawn({}, testTls);
800	const thread2 = try std.os.spawnThread({}, testTls);	800	const thread2 = try std.Thread.spawn({}, testTls);
801	testTls({});	801	testTls({});
802	thread1.wait();	802	thread1.wait();
803	thread2.wait();	803	thread2.wait();

example/cat/main.zig+5-4

 @@ -1,12 +1,13 @@
 const std = @import("std");
 const io = std.io;
+const process = std.process;
+const File = std.fs.File;
 const mem = std.mem;
-const os = std.os;
 const warn = std.debug.warn;
 const allocator = std.debug.global_allocator;
 pub fn main() !void {
-    var args_it = os.args();
+    var args_it = process.args();
     const exe = try unwrapArg(args_it.next(allocator).?);
     var catted_anything = false;
     var stdout_file = try io.getStdOut();
 @@ -20,7 +21,7 @@ pub fn main() !void {
         } else if (arg[0] == '-') {
             return usage(exe);
         } else {
-            var file = os.File.openRead(arg) catch |err| {
+            var file = File.openRead(arg) catch |err| {
                 warn("Unable to open file: {}\n", @errorName(err));
                 return err;
             };
 @@ -41,7 +42,7 @@ fn usage(exe: []const u8) !void {
     return error.Invalid;
 }
-fn cat_file(stdout: *os.File, file: *os.File) !void {
+fn cat_file(stdout: *File, file: *File) !void {
     var buf: [1024 * 4]u8 = undefined;
     while (true) {

example/guess_number/main.zig+1-2

...	@@ -2,7 +2,6 @@ const builtin = @import("builtin");	...	@@ -2,7 +2,6 @@ const builtin = @import("builtin");
2	const std = @import("std");	2	const std = @import("std");
3	const io = std.io;	3	const io = std.io;
4	const fmt = std.fmt;	4	const fmt = std.fmt;
5	const os = std.os;
6		5
7	pub fn main() !void {	6	pub fn main() !void {
8	var stdout_file = try io.getStdOut();	7	var stdout_file = try io.getStdOut();
...	@@ -11,7 +10,7 @@ pub fn main() !void {	...	@@ -11,7 +10,7 @@ pub fn main() !void {
11	try stdout.print("Welcome to the Guess Number Game in Zig.\n");	10	try stdout.print("Welcome to the Guess Number Game in Zig.\n");
12		11
13	var seed_bytes: [@sizeOf(u64)]u8 = undefined;	12	var seed_bytes: [@sizeOf(u64)]u8 = undefined;
14	os.getRandomBytes(seed_bytes[0..]) catch \|err\| {	13	std.crypto.randomBytes(seed_bytes[0..]) catch \|err\| {
15	std.debug.warn("unable to seed random number generator: {}", err);	14	std.debug.warn("unable to seed random number generator: {}", err);
16	return err;	15	return err;
17	};	16	};

example/hello_world/hello_libc.zig+1-1

...	@@ -5,6 +5,6 @@ const c = @cImport({	...	@@ -5,6 +5,6 @@ const c = @cImport({
5	});	5	});
6		6
7	export fn main(argc: c_int, argv: []?[]u8) c_int {	7	export fn main(argc: c_int, argv: []?[]u8) c_int {
8	c.fprintf(c.stderr, c"Hello, world!\n");	8	_ = c.fprintf(c.stderr, c"Hello, world!\n");
9	return 0;	9	return 0;
10	}	10	}

src-self-hosted/compilation.zig+1

...	@@ -301,6 +301,7 @@ pub const Compilation = struct {	...	@@ -301,6 +301,7 @@ pub const Compilation = struct {
301	InvalidUtf8,	301	InvalidUtf8,
302	BadPathName,	302	BadPathName,
303	DeviceBusy,	303	DeviceBusy,
		304	CurrentWorkingDirectoryUnlinked,
304	};	305	};
305		306
306	pub const Event = union(enum) {	307	pub const Event = union(enum) {

src-self-hosted/libc_installation.zig+3-3

src-self-hosted/main.zig+10-9

 @@ -702,6 +702,7 @@ const FmtError = error{
     ReadOnlyFileSystem,
     LinkQuotaExceeded,
     FileBusy,
+    CurrentWorkingDirectoryUnlinked,
 } || fs.File.OpenError;
 async fn asyncFmtMain(
 @@ -851,7 +852,7 @@ fn cmdTargets(allocator: *Allocator, args: []const []const u8) !void {
 }
 fn cmdVersion(allocator: *Allocator, args: []const []const u8) !void {
-    try stdout.print("{}\n", std.cstr.toSliceConst(c.ZIG_VERSION_STRING));
+    try stdout.print("{}\n", std.mem.toSliceConst(u8, c.ZIG_VERSION_STRING));
 }
 const args_test_spec = []Flag{Flag.Bool("--help")};
 @@ -924,14 +925,14 @@ fn cmdInternalBuildInfo(allocator: *Allocator, args: []const []const u8) !void {
         \\ZIG_DIA_GUIDS_LIB    {}
         \\
     ,
-        std.cstr.toSliceConst(c.ZIG_CMAKE_BINARY_DIR),
+        std.mem.toSliceConst(u8, c.ZIG_CMAKE_BINARY_DIR),
-        std.cstr.toSliceConst(c.ZIG_CXX_COMPILER),
+        std.mem.toSliceConst(u8, c.ZIG_CXX_COMPILER),
-        std.cstr.toSliceConst(c.ZIG_LLVM_CONFIG_EXE),
+        std.mem.toSliceConst(u8, c.ZIG_LLVM_CONFIG_EXE),
-        std.cstr.toSliceConst(c.ZIG_LLD_INCLUDE_PATH),
+        std.mem.toSliceConst(u8, c.ZIG_LLD_INCLUDE_PATH),
-        std.cstr.toSliceConst(c.ZIG_LLD_LIBRARIES),
+        std.mem.toSliceConst(u8, c.ZIG_LLD_LIBRARIES),
-        std.cstr.toSliceConst(c.ZIG_STD_FILES),
+        std.mem.toSliceConst(u8, c.ZIG_STD_FILES),
-        std.cstr.toSliceConst(c.ZIG_C_HEADER_FILES),
+        std.mem.toSliceConst(u8, c.ZIG_C_HEADER_FILES),
-        std.cstr.toSliceConst(c.ZIG_DIA_GUIDS_LIB),
+        std.mem.toSliceConst(u8, c.ZIG_DIA_GUIDS_LIB),
     );
 }

std/c.zig+9-4

 @@ -39,8 +39,8 @@ pub extern "c" fn open(path: [*]const u8, oflag: c_uint, ...) c_int;
 pub extern "c" fn raise(sig: c_int) c_int;
 pub extern "c" fn read(fd: fd_t, buf: [*]u8, nbyte: usize) isize;
 pub extern "c" fn pread(fd: fd_t, buf: [*]u8, nbyte: usize, offset: u64) isize;
-pub extern "c" fn preadv(fd: c_int, iov: [*]const iovec, iovcnt: c_int, offset: usize) isize;
+pub extern "c" fn preadv(fd: c_int, iov: [*]const iovec, iovcnt: c_uint, offset: usize) isize;
-pub extern "c" fn pwritev(fd: c_int, iov: [*]const iovec, iovcnt: c_int, offset: usize) isize;
+pub extern "c" fn pwritev(fd: c_int, iov: [*]const iovec_const, iovcnt: c_uint, offset: usize) isize;
 pub extern "c" fn stat(noalias path: [*]const u8, noalias buf: *Stat) c_int;
 pub extern "c" fn write(fd: fd_t, buf: [*]const u8, nbyte: usize) isize;
 pub extern "c" fn pwrite(fd: fd_t, buf: [*]const u8, nbyte: usize, offset: u64) isize;
 @@ -49,7 +49,7 @@ pub extern "c" fn munmap(addr: *align(page_size) c_void, len: usize) c_int;
 pub extern "c" fn mprotect(addr: *align(page_size) c_void, len: usize, prot: c_uint) c_int;
 pub extern "c" fn unlink(path: [*]const u8) c_int;
 pub extern "c" fn getcwd(buf: [*]u8, size: usize) ?[*]u8;
-pub extern "c" fn waitpid(pid: c_int, stat_loc: *c_int, options: c_int) c_int;
+pub extern "c" fn waitpid(pid: c_int, stat_loc: *c_uint, options: c_uint) c_int;
 pub extern "c" fn fork() c_int;
 pub extern "c" fn access(path: [*]const u8, mode: c_uint) c_int;
 pub extern "c" fn pipe(fds: *[2]fd_t) c_int;
 @@ -76,7 +76,12 @@ pub extern "c" fn sysctlbyname(name: [*]const u8, oldp: ?*c_void, oldlenp: ?*usi
 pub extern "c" fn sysctlnametomib(name: [*]const u8, mibp: ?*c_int, sizep: ?*usize) c_int;
 pub extern "c" fn bind(socket: fd_t, address: ?*const sockaddr, address_len: socklen_t) c_int;
-pub extern "c" fn socket(domain: c_int, sock_type: c_int, protocol: c_int) c_int;
+pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
+pub extern "c" fn listen(sockfd: fd_t, backlog: c_uint) c_int;
+pub extern "c" fn getsockname(sockfd: fd_t, noalias addr: *sockaddr, noalias addrlen: *socklen_t) c_int;
+pub extern "c" fn connect(sockfd: fd_t, sock_addr: *const sockaddr, addrlen: socklen_t) c_int;
+pub extern "c" fn accept4(sockfd: fd_t, addr: *sockaddr, addrlen: *socklen_t, flags: c_uint) c_int;
+pub extern "c" fn getsockopt(sockfd: fd_t, level: c_int, optname: c_int, optval: *c_void, optlen: *socklen_t) c_int;
 pub extern "c" fn kill(pid: pid_t, sig: c_int) c_int;
 pub extern "c" fn getdirentries(fd: fd_t, buf_ptr: [*]u8, nbytes: usize, basep: *i64) isize;
 pub extern "c" fn openat(fd: c_int, path: [*]const u8, flags: c_int) c_int;

std/c/linux.zig+18-4

...	@@ -1,13 +1,27 @@	...	@@ -1,13 +1,27 @@
1	const std = @import("../std.zig");	1	const std = @import("../std.zig");
2	use std.c;	2	use std.c;
3		3
4	pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) c_int;
5	pub extern "c" fn sched_getaffinity(pid: c_int, size: usize, set: *cpu_set_t) c_int;
6	extern "c" fn __errno_location() *c_int;	4	extern "c" fn __errno_location() *c_int;
7	pub const _errno = __errno_location;	5	pub const _errno = __errno_location;
8		6
		7	pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) c_int;
		8	pub extern "c" fn sched_getaffinity(pid: c_int, size: usize, set: *cpu_set_t) c_int;
		9	pub extern "c" fn eventfd(initval: c_uint, flags: c_uint) c_int;
		10	pub extern "c" fn epoll_ctl(epfd: fd_t, op: c_uint, fd: fd_t, event: *epoll_event) c_int;
		11	pub extern "c" fn epoll_create1(flags: c_uint) c_int;
		12	pub extern "c" fn epoll_wait(epfd: fd_t, events: [*]epoll_event, maxevents: c_uint, timeout: c_int) c_int;
		13	pub extern "c" fn epoll_pwait(
		14	epfd: fd_t,
		15	events: [*]epoll_event,
		16	maxevents: c_int,
		17	timeout: c_int,
		18	sigmask: *const sigset_t,
		19	) c_int;
		20	pub extern "c" fn inotify_init1(flags: c_uint) c_int;
		21	pub extern "c" fn inotify_add_watch(fd: fd_t, pathname: [*]const u8, mask: u32) c_int;
		22
9	/// See std.elf for constants for this	23	/// See std.elf for constants for this
10	pub extern fn getauxval(__type: c_ulong) c_ulong;	24	pub extern "c" fn getauxval(__type: c_ulong) c_ulong;
11		25
12	pub const dl_iterate_phdr_callback = extern fn (info: dl_phdr_info, size: usize, data: ?c_void) c_int;	26	pub const dl_iterate_phdr_callback = extern fn (info: dl_phdr_info, size: usize, data: ?c_void) c_int;
13	pub extern fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;	27	pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;

std/child_process.zig+9-9

...	@@ -54,10 +54,10 @@ pub const ChildProcess = struct {	...	@@ -54,10 +54,10 @@ pub const ChildProcess = struct {
54	os.ChangeCurDirError \|\| windows.CreateProcessError;	54	os.ChangeCurDirError \|\| windows.CreateProcessError;
55		55
56	pub const Term = union(enum) {	56	pub const Term = union(enum) {
57	Exited: i32,	57	Exited: u32,
58	Signal: i32,	58	Signal: u32,
59	Stopped: i32,	59	Stopped: u32,
60	Unknown: i32,	60	Unknown: u32,
61	};	61	};
62		62
63	pub const StdIo = enum {	63	pub const StdIo = enum {
...	@@ -155,7 +155,7 @@ pub const ChildProcess = struct {	...	@@ -155,7 +155,7 @@ pub const ChildProcess = struct {
155	}	155	}
156		156
157	pub const ExecResult = struct {	157	pub const ExecResult = struct {
158	term: os.ChildProcess.Term,	158	term: Term,
159	stdout: []u8,	159	stdout: []u8,
160	stderr: []u8,	160	stderr: []u8,
161	};	161	};
...	@@ -224,7 +224,7 @@ pub const ChildProcess = struct {	...	@@ -224,7 +224,7 @@ pub const ChildProcess = struct {
224	if (windows.GetExitCodeProcess(self.handle, &exit_code) == 0) {	224	if (windows.GetExitCodeProcess(self.handle, &exit_code) == 0) {
225	break :x Term{ .Unknown = 0 };	225	break :x Term{ .Unknown = 0 };
226	} else {	226	} else {
227	break :x Term{ .Exited = @bitCast(i32, exit_code) };	227	break :x Term{ .Exited = exit_code };
228	}	228	}
229	});	229	});
230		230
...	@@ -240,7 +240,7 @@ pub const ChildProcess = struct {	...	@@ -240,7 +240,7 @@ pub const ChildProcess = struct {
240	self.handleWaitResult(status);	240	self.handleWaitResult(status);
241	}	241	}
242		242
243	fn handleWaitResult(self: *ChildProcess, status: i32) void {	243	fn handleWaitResult(self: *ChildProcess, status: u32) void {
244	self.term = self.cleanupAfterWait(status);	244	self.term = self.cleanupAfterWait(status);
245	}	245	}
246		246
...	@@ -259,7 +259,7 @@ pub const ChildProcess = struct {	...	@@ -259,7 +259,7 @@ pub const ChildProcess = struct {
259	}	259	}
260	}	260	}
261		261
262	fn cleanupAfterWait(self: *ChildProcess, status: i32) !Term {	262	fn cleanupAfterWait(self: *ChildProcess, status: u32) !Term {
263	defer {	263	defer {
264	os.close(self.err_pipe[0]);	264	os.close(self.err_pipe[0]);
265	os.close(self.err_pipe[1]);	265	os.close(self.err_pipe[1]);
...	@@ -281,7 +281,7 @@ pub const ChildProcess = struct {	...	@@ -281,7 +281,7 @@ pub const ChildProcess = struct {
281	return statusToTerm(status);	281	return statusToTerm(status);
282	}	282	}
283		283
284	fn statusToTerm(status: i32) Term {	284	fn statusToTerm(status: u32) Term {
285	return if (os.WIFEXITED(status))	285	return if (os.WIFEXITED(status))
286	Term{ .Exited = os.WEXITSTATUS(status) }	286	Term{ .Exited = os.WEXITSTATUS(status) }
287	else if (os.WIFSIGNALED(status))	287	else if (os.WIFSIGNALED(status))

std/cstr.zig+1-1

...	@@ -28,7 +28,7 @@ test "cstr fns" {	...	@@ -28,7 +28,7 @@ test "cstr fns" {
28		28
29	fn testCStrFnsImpl() void {	29	fn testCStrFnsImpl() void {
30	testing.expect(cmp(c"aoeu", c"aoez") == -1);	30	testing.expect(cmp(c"aoeu", c"aoez") == -1);
31	testing.expect(len(c"123456789") == 9);	31	testing.expect(mem.len(u8, c"123456789") == 9);
32	}	32	}
33		33
34	/// Returns a mutable slice with 1 more byte of length which is a null byte.	34	/// Returns a mutable slice with 1 more byte of length which is a null byte.

std/dynamic_library.zig+13-25

 @@ -6,8 +6,7 @@ const os = std.os;
 const assert = std.debug.assert;
 const testing = std.testing;
 const elf = std.elf;
-const windows = os.windows;
+const windows = std.os.windows;
-const win_util = @import("os/windows/util.zig");
 const maxInt = std.math.maxInt;
 pub const DynLib = switch (builtin.os) {
 @@ -102,17 +101,16 @@ pub fn linkmap_iterator(phdrs: []elf.Phdr) !LinkMap.Iterator {
 pub const LinuxDynLib = struct {
     elf_lib: ElfLib,
     fd: i32,
-    map_addr: usize,
+    memory: []align(mem.page_size) u8,
-    map_size: usize,
     /// Trusts the file
     pub fn open(allocator: *mem.Allocator, path: []const u8) !DynLib {
         const fd = try os.open(path, 0, os.O_RDONLY | os.O_CLOEXEC);
-        errdefer std.os.close(fd);
+        errdefer os.close(fd);
-        const size = @intCast(usize, (try std.os.posixFStat(fd)).size);
+        const size = @intCast(usize, (try os.fstat(fd)).size);
-        const addr = os.mmap(
+        const bytes = try os.mmap(
             null,
             size,
             os.PROT_READ | os.PROT_EXEC,
 @@ -120,21 +118,18 @@ pub const LinuxDynLib = struct {
             fd,
             0,
         );
-        errdefer os.munmap(addr, size);
+        errdefer os.munmap(bytes);
-        const bytes = @intToPtr([*]align(mem.page_size) u8, addr)[0..size];
         return DynLib{
             .elf_lib = try ElfLib.init(bytes),
             .fd = fd,
-            .map_addr = addr,
+            .memory = bytes,
-            .map_size = size,
         };
     }
     pub fn close(self: *DynLib) void {
-        os.munmap(self.map_addr, self.map_size);
+        os.munmap(self.memory);
-        std.os.close(self.fd);
+        os.close(self.fd);
         self.* = undefined;
     }
 @@ -253,28 +248,21 @@ pub const WindowsDynLib = struct {
     dll: windows.HMODULE,
     pub fn open(allocator: *mem.Allocator, path: []const u8) !WindowsDynLib {
-        const wpath = try win_util.sliceToPrefixedFileW(path);
+        const wpath = try windows.sliceToPrefixedFileW(path);
         return WindowsDynLib{
             .allocator = allocator,
-            .dll = windows.LoadLibraryW(&wpath) orelse {
+            .dll = try windows.LoadLibraryW(&wpath),
-                switch (windows.GetLastError()) {
-                    windows.ERROR.FILE_NOT_FOUND => return error.FileNotFound,
-                    windows.ERROR.PATH_NOT_FOUND => return error.FileNotFound,
-                    windows.ERROR.MOD_NOT_FOUND => return error.FileNotFound,
-                    else => |err| return windows.unexpectedError(err),
-                }
-            },
         };
     }
     pub fn close(self: *WindowsDynLib) void {
-        assert(windows.FreeLibrary(self.dll) != 0);
+        windows.FreeLibrary(self.dll);
         self.* = undefined;
     }
     pub fn lookup(self: *WindowsDynLib, name: []const u8) ?usize {
-        return @ptrToInt(windows.GetProcAddress(self.dll, name.ptr));
+        return @ptrToInt(windows.kernel32.GetProcAddress(self.dll, name.ptr));
     }
 };

std/event/fs.zig+7-7

...	@@ -36,7 +36,7 @@ pub const Request = struct {	...	@@ -36,7 +36,7 @@ pub const Request = struct {
36	offset: usize,	36	offset: usize,
37	result: Error!void,	37	result: Error!void,
38		38
39	pub const Error = os.PosixWriteError;	39	pub const Error = os.WriteError;
40	};	40	};
41		41
42	pub const PReadV = struct {	42	pub const PReadV = struct {
...	@@ -45,7 +45,7 @@ pub const Request = struct {	...	@@ -45,7 +45,7 @@ pub const Request = struct {
45	offset: usize,	45	offset: usize,
46	result: Error!usize,	46	result: Error!usize,
47		47
48	pub const Error = os.PosixReadError;	48	pub const Error = os.ReadError;
49	};	49	};
50		50
51	pub const Open = struct {	51	pub const Open = struct {
...	@@ -172,7 +172,7 @@ pub async fn pwritevPosix(	...	@@ -172,7 +172,7 @@ pub async fn pwritevPosix(
172	fd: fd_t,	172	fd: fd_t,
173	iovecs: []const os.iovec_const,	173	iovecs: []const os.iovec_const,
174	offset: usize,	174	offset: usize,
175	) os.PosixWriteError!void {	175	) os.WriteError!void {
176	// workaround for https://github.com/ziglang/zig/issues/1194	176	// workaround for https://github.com/ziglang/zig/issues/1194
177	suspend {	177	suspend {
178	resume @handle();	178	resume @handle();
...	@@ -320,7 +320,7 @@ pub async fn preadvPosix(	...	@@ -320,7 +320,7 @@ pub async fn preadvPosix(
320	fd: fd_t,	320	fd: fd_t,
321	iovecs: []const os.iovec,	321	iovecs: []const os.iovec,
322	offset: usize,	322	offset: usize,
323	) os.PosixReadError!usize {	323	) os.ReadError!usize {
324	// workaround for https://github.com/ziglang/zig/issues/1194	324	// workaround for https://github.com/ziglang/zig/issues/1194
325	suspend {	325	suspend {
326	resume @handle();	326	resume @handle();
...	@@ -786,7 +786,7 @@ pub fn Watch(comptime V: type) type {	...	@@ -786,7 +786,7 @@ pub fn Watch(comptime V: type) type {
786		786
787	switch (builtin.os) {	787	switch (builtin.os) {
788	builtin.Os.linux => {	788	builtin.Os.linux => {
789	const inotify_fd = try os.linuxINotifyInit1(os.linux.IN_NONBLOCK \| os.linux.IN_CLOEXEC);	789	const inotify_fd = try os.inotify_init1(os.linux.IN_NONBLOCK \| os.linux.IN_CLOEXEC);
790	errdefer os.close(inotify_fd);	790	errdefer os.close(inotify_fd);
791		791
792	var result: *Self = undefined;	792	var result: *Self = undefined;
...	@@ -977,7 +977,7 @@ pub fn Watch(comptime V: type) type {	...	@@ -977,7 +977,7 @@ pub fn Watch(comptime V: type) type {
977	var basename_with_null_consumed = false;	977	var basename_with_null_consumed = false;
978	defer if (!basename_with_null_consumed) self.channel.loop.allocator.free(basename_with_null);	978	defer if (!basename_with_null_consumed) self.channel.loop.allocator.free(basename_with_null);
979		979
980	const wd = try os.linuxINotifyAddWatchC(	980	const wd = try os.inotify_add_watchC(
981	self.os_data.inotify_fd,	981	self.os_data.inotify_fd,
982	dirname_with_null.ptr,	982	dirname_with_null.ptr,
983	os.linux.IN_CLOSE_WRITE \| os.linux.IN_ONLYDIR \| os.linux.IN_EXCL_UNLINK,	983	os.linux.IN_CLOSE_WRITE \| os.linux.IN_ONLYDIR \| os.linux.IN_EXCL_UNLINK,
...	@@ -1255,7 +1255,7 @@ pub fn Watch(comptime V: type) type {	...	@@ -1255,7 +1255,7 @@ pub fn Watch(comptime V: type) type {
1255	ev = @ptrCast(*os.linux.inotify_event, ptr);	1255	ev = @ptrCast(*os.linux.inotify_event, ptr);
1256	if (ev.mask & os.linux.IN_CLOSE_WRITE == os.linux.IN_CLOSE_WRITE) {	1256	if (ev.mask & os.linux.IN_CLOSE_WRITE == os.linux.IN_CLOSE_WRITE) {
1257	const basename_ptr = ptr + @sizeOf(os.linux.inotify_event);	1257	const basename_ptr = ptr + @sizeOf(os.linux.inotify_event);
1258	const basename_with_null = basename_ptr[0 .. std.cstr.len(basename_ptr) + 1];	1258	const basename_with_null = basename_ptr[0 .. std.mem.len(u8, basename_ptr) + 1];
1259	const user_value = blk: {	1259	const user_value = blk: {
1260	const held = await (async watch.os_data.table_lock.acquire() catch unreachable);	1260	const held = await (async watch.os_data.table_lock.acquire() catch unreachable);
1261	defer held.release();	1261	defer held.release();

std/event/loop.zig+16-16

...	@@ -99,7 +99,7 @@ pub const Loop = struct {	...	@@ -99,7 +99,7 @@ pub const Loop = struct {
99	/// have the correct pointer value.	99	/// have the correct pointer value.
100	pub fn initMultiThreaded(self: Loop, allocator: mem.Allocator) !void {	100	pub fn initMultiThreaded(self: Loop, allocator: mem.Allocator) !void {
101	if (builtin.single_threaded) @compileError("initMultiThreaded unavailable when building in single-threaded mode");	101	if (builtin.single_threaded) @compileError("initMultiThreaded unavailable when building in single-threaded mode");
102	const core_count = try os.cpuCount(allocator);	102	const core_count = try Thread.cpuCount();
103	return self.initInternal(allocator, core_count);	103	return self.initInternal(allocator, core_count);
104	}	104	}
105		105
...	@@ -139,9 +139,9 @@ pub const Loop = struct {	...	@@ -139,9 +139,9 @@ pub const Loop = struct {
139	self.allocator.free(self.extra_threads);	139	self.allocator.free(self.extra_threads);
140	}	140	}
141		141
142	const InitOsDataError = os.LinuxEpollCreateError \|\| mem.Allocator.Error \|\| os.LinuxEventFdError \|\|	142	const InitOsDataError = os.EpollCreateError \|\| mem.Allocator.Error \|\| os.EventFdError \|\|
143	os.SpawnThreadError \|\| os.LinuxEpollCtlError \|\| os.BsdKEventError \|\|	143	Thread.SpawnError \|\| os.EpollCtlError \|\| os.KEventError \|\|
144	os.WindowsCreateIoCompletionPortError;	144	windows.CreateIoCompletionPortError;
145		145
146	const wakeup_bytes = []u8{0x1} ** 8;	146	const wakeup_bytes = []u8{0x1} ** 8;
147		147
...	@@ -172,7 +172,7 @@ pub const Loop = struct {	...	@@ -172,7 +172,7 @@ pub const Loop = struct {
172	.handle = undefined,	172	.handle = undefined,
173	.overlapped = ResumeNode.overlapped_init,	173	.overlapped = ResumeNode.overlapped_init,
174	},	174	},
175	.eventfd = try os.linuxEventFd(1, os.EFD_CLOEXEC \| os.EFD_NONBLOCK),	175	.eventfd = try os.eventfd(1, os.EFD_CLOEXEC \| os.EFD_NONBLOCK),
176	.epoll_op = os.EPOLL_CTL_ADD,	176	.epoll_op = os.EPOLL_CTL_ADD,
177	},	177	},
178	.next = undefined,	178	.next = undefined,
...	@@ -180,17 +180,17 @@ pub const Loop = struct {	...	@@ -180,17 +180,17 @@ pub const Loop = struct {
180	self.available_eventfd_resume_nodes.push(eventfd_node);	180	self.available_eventfd_resume_nodes.push(eventfd_node);
181	}	181	}
182		182
183	self.os_data.epollfd = try os.linuxEpollCreate(os.EPOLL_CLOEXEC);	183	self.os_data.epollfd = try os.epoll_create1(os.EPOLL_CLOEXEC);
184	errdefer os.close(self.os_data.epollfd);	184	errdefer os.close(self.os_data.epollfd);
185		185
186	self.os_data.final_eventfd = try os.linuxEventFd(0, os.EFD_CLOEXEC \| os.EFD_NONBLOCK);	186	self.os_data.final_eventfd = try os.eventfd(0, os.EFD_CLOEXEC \| os.EFD_NONBLOCK);
187	errdefer os.close(self.os_data.final_eventfd);	187	errdefer os.close(self.os_data.final_eventfd);
188		188
189	self.os_data.final_eventfd_event = os.epoll_event{	189	self.os_data.final_eventfd_event = os.epoll_event{
190	.events = os.EPOLLIN,	190	.events = os.EPOLLIN,
191	.data = os.epoll_data{ .ptr = @ptrToInt(&self.final_resume_node) },	191	.data = os.epoll_data{ .ptr = @ptrToInt(&self.final_resume_node) },
192	};	192	};
193	try os.linuxEpollCtl(	193	try os.epoll_ctl(
194	self.os_data.epollfd,	194	self.os_data.epollfd,
195	os.EPOLL_CTL_ADD,	195	os.EPOLL_CTL_ADD,
196	self.os_data.final_eventfd,	196	self.os_data.final_eventfd,
...	@@ -211,7 +211,7 @@ pub const Loop = struct {	...	@@ -211,7 +211,7 @@ pub const Loop = struct {
211	var extra_thread_index: usize = 0;	211	var extra_thread_index: usize = 0;
212	errdefer {	212	errdefer {
213	// writing 8 bytes to an eventfd cannot fail	213	// writing 8 bytes to an eventfd cannot fail
214	os.posixWrite(self.os_data.final_eventfd, wakeup_bytes) catch unreachable;	214	os.write(self.os_data.final_eventfd, wakeup_bytes) catch unreachable;
215	while (extra_thread_index != 0) {	215	while (extra_thread_index != 0) {
216	extra_thread_index -= 1;	216	extra_thread_index -= 1;
217	self.extra_threads[extra_thread_index].wait();	217	self.extra_threads[extra_thread_index].wait();
...	@@ -417,11 +417,11 @@ pub const Loop = struct {	...	@@ -417,11 +417,11 @@ pub const Loop = struct {
417	.events = flags,	417	.events = flags,
418	.data = os.linux.epoll_data{ .ptr = @ptrToInt(resume_node) },	418	.data = os.linux.epoll_data{ .ptr = @ptrToInt(resume_node) },
419	};	419	};
420	try os.linuxEpollCtl(self.os_data.epollfd, op, fd, &ev);	420	try os.epoll_ctl(self.os_data.epollfd, op, fd, &ev);
421	}	421	}
422		422
423	pub fn linuxRemoveFd(self: *Loop, fd: i32) void {	423	pub fn linuxRemoveFd(self: *Loop, fd: i32) void {
424	os.linuxEpollCtl(self.os_data.epollfd, os.linux.EPOLL_CTL_DEL, fd, undefined) catch {};	424	os.epoll_ctl(self.os_data.epollfd, os.linux.EPOLL_CTL_DEL, fd, undefined) catch {};
425	self.finishOneEvent();	425	self.finishOneEvent();
426	}	426	}
427		427
...	@@ -626,7 +626,7 @@ pub const Loop = struct {	...	@@ -626,7 +626,7 @@ pub const Loop = struct {
626	builtin.Os.linux => {	626	builtin.Os.linux => {
627	self.posixFsRequest(&self.os_data.fs_end_request);	627	self.posixFsRequest(&self.os_data.fs_end_request);
628	// writing 8 bytes to an eventfd cannot fail	628	// writing 8 bytes to an eventfd cannot fail
629	os.posixWrite(self.os_data.final_eventfd, wakeup_bytes) catch unreachable;	629	os.write(self.os_data.final_eventfd, wakeup_bytes) catch unreachable;
630	return;	630	return;
631	},	631	},
632	builtin.Os.macosx, builtin.Os.freebsd, builtin.Os.netbsd => {	632	builtin.Os.macosx, builtin.Os.freebsd, builtin.Os.netbsd => {
...	@@ -666,7 +666,7 @@ pub const Loop = struct {	...	@@ -666,7 +666,7 @@ pub const Loop = struct {
666	builtin.Os.linux => {	666	builtin.Os.linux => {
667	// only process 1 event so we don't steal from other threads	667	// only process 1 event so we don't steal from other threads
668	var events: [1]os.linux.epoll_event = undefined;	668	var events: [1]os.linux.epoll_event = undefined;
669	const count = os.linuxEpollWait(self.os_data.epollfd, events[0..], -1);	669	const count = os.epoll_wait(self.os_data.epollfd, events[0..], -1);
670	for (events[0..count]) \|ev\| {	670	for (events[0..count]) \|ev\| {
671	const resume_node = @intToPtr(*ResumeNode, ev.data.ptr);	671	const resume_node = @intToPtr(*ResumeNode, ev.data.ptr);
672	const handle = resume_node.handle;	672	const handle = resume_node.handle;
...	@@ -783,10 +783,10 @@ pub const Loop = struct {	...	@@ -783,10 +783,10 @@ pub const Loop = struct {
783	switch (node.data.msg) {	783	switch (node.data.msg) {
784	@TagType(fs.Request.Msg).End => return,	784	@TagType(fs.Request.Msg).End => return,
785	@TagType(fs.Request.Msg).PWriteV => \|*msg\| {	785	@TagType(fs.Request.Msg).PWriteV => \|*msg\| {
786	msg.result = os.posix_pwritev(msg.fd, msg.iov.ptr, msg.iov.len, msg.offset);	786	msg.result = os.pwritev(msg.fd, msg.iov, msg.offset);
787	},	787	},
788	@TagType(fs.Request.Msg).PReadV => \|*msg\| {	788	@TagType(fs.Request.Msg).PReadV => \|*msg\| {
789	msg.result = os.posix_preadv(msg.fd, msg.iov.ptr, msg.iov.len, msg.offset);	789	msg.result = os.preadv(msg.fd, msg.iov, msg.offset);
790	},	790	},
791	@TagType(fs.Request.Msg).Open => \|*msg\| {	791	@TagType(fs.Request.Msg).Open => \|*msg\| {
792	msg.result = os.openC(msg.path.ptr, msg.flags, msg.mode);	792	msg.result = os.openC(msg.path.ptr, msg.flags, msg.mode);
...	@@ -800,7 +800,7 @@ pub const Loop = struct {	...	@@ -800,7 +800,7 @@ pub const Loop = struct {
800	break :blk;	800	break :blk;
801	};	801	};
802	defer os.close(fd);	802	defer os.close(fd);
803	msg.result = os.posixWrite(fd, msg.contents);	803	msg.result = os.write(fd, msg.contents);
804	},	804	},
805	}	805	}
806	switch (node.data.finish) {	806	switch (node.data.finish) {

std/event/net.zig+15-12

 @@ -45,13 +45,13 @@ pub const Server = struct {
     ) !void {
         self.handleRequestFn = handleRequestFn;
-        const sockfd = try os.posixSocket(os.AF_INET, os.SOCK_STREAM | os.SOCK_CLOEXEC | os.SOCK_NONBLOCK, os.PROTO_tcp);
+        const sockfd = try os.socket(os.AF_INET, os.SOCK_STREAM | os.SOCK_CLOEXEC | os.SOCK_NONBLOCK, os.PROTO_tcp);
         errdefer os.close(sockfd);
         self.sockfd = sockfd;
-        try os.posixBind(sockfd, &address.os_addr);
+        try os.bind(sockfd, &address.os_addr);
-        try os.posixListen(sockfd, os.SOMAXCONN);
+        try os.listen(sockfd, os.SOMAXCONN);
-        self.listen_address = std.net.Address.initPosix(try os.posixGetSockName(sockfd));
+        self.listen_address = std.net.Address.initPosix(try os.getsockname(sockfd));
         self.accept_coro = try async<self.loop.allocator> Server.handler(self);
         errdefer cancel self.accept_coro.?;
 @@ -64,7 +64,10 @@ pub const Server = struct {
     /// Stop listening
     pub fn close(self: *Server) void {
         self.loop.linuxRemoveFd(self.sockfd.?);
-        os.close(self.sockfd.?);
+        if (self.sockfd) |fd| {
+            os.close(fd);
+            self.sockfd = null;
+        }
     }
     pub fn deinit(self: *Server) void {
 @@ -76,7 +79,7 @@ pub const Server = struct {
         while (true) {
             var accepted_addr: std.net.Address = undefined;
             // TODO just inline the following function here and don't expose it as posixAsyncAccept
-            if (os.posixAsyncAccept(self.sockfd.?, &accepted_addr.os_addr, os.SOCK_NONBLOCK | os.SOCK_CLOEXEC)) |accepted_fd| {
+            if (os.accept4_async(self.sockfd.?, &accepted_addr.os_addr, os.SOCK_NONBLOCK | os.SOCK_CLOEXEC)) |accepted_fd| {
                 if (accepted_fd == -1) {
                     // would block
                     suspend; // we will get resumed by epoll_wait in the event loop
 @@ -105,7 +108,7 @@ pub const Server = struct {
 };
 pub async fn connectUnixSocket(loop: *Loop, path: []const u8) !i32 {
-    const sockfd = try os.posixSocket(
+    const sockfd = try os.socket(
         os.AF_UNIX,
         os.SOCK_STREAM | os.SOCK_CLOEXEC | os.SOCK_NONBLOCK,
         0,
 @@ -120,9 +123,9 @@ pub async fn connectUnixSocket(loop: *Loop, path: []const u8) !i32 {
     if (path.len > @typeOf(sock_addr.path).len) return error.NameTooLong;
     mem.copy(u8, sock_addr.path[0..], path);
     const size = @intCast(u32, @sizeOf(os.sa_family_t) + path.len);
-    try os.posixConnectAsync(sockfd, &sock_addr, size);
+    try os.connect_async(sockfd, &sock_addr, size);
     try await try async loop.linuxWaitFd(sockfd, os.EPOLLIN | os.EPOLLOUT | os.EPOLLET);
-    try os.posixGetSockOptConnectError(sockfd);
+    try os.getsockoptError(sockfd);
     return sockfd;
 }
 @@ -249,12 +252,12 @@ pub async fn readv(loop: *Loop, fd: fd_t, data: []const []u8) !usize {
 pub async fn connect(loop: *Loop, _address: *const std.net.Address) !File {
     var address = _address.*; // TODO https://github.com/ziglang/zig/issues/1592
-    const sockfd = try os.posixSocket(os.AF_INET, os.SOCK_STREAM | os.SOCK_CLOEXEC | os.SOCK_NONBLOCK, os.PROTO_tcp);
+    const sockfd = try os.socket(os.AF_INET, os.SOCK_STREAM | os.SOCK_CLOEXEC | os.SOCK_NONBLOCK, os.PROTO_tcp);
     errdefer os.close(sockfd);
-    try os.posixConnectAsync(sockfd, &address.os_addr, @sizeOf(os.sockaddr_in));
+    try os.connect_async(sockfd, &address.os_addr, @sizeOf(os.sockaddr_in));
     try await try async loop.linuxWaitFd(sockfd, os.EPOLLIN | os.EPOLLOUT | os.EPOLLET);
-    try os.posixGetSockOptConnectError(sockfd);
+    try os.getsockoptError(sockfd);
     return File.openHandle(sockfd);
 }

std/fs.zig+4-22

 @@ -38,24 +38,6 @@ pub const MAX_PATH_BYTES = switch (builtin.os) {
     else => @compileError("Unsupported OS"),
 };
-/// The result is a slice of `out_buffer`, from index `0`.
-pub fn getCwd(out_buffer: *[MAX_PATH_BYTES]u8) ![]u8 {
-    return os.getcwd(out_buffer);
-}
-/// Caller must free the returned memory.
-pub fn getCwdAlloc(allocator: *Allocator) ![]u8 {
-    var buf: [MAX_PATH_BYTES]u8 = undefined;
-    return mem.dupe(allocator, u8, try os.getcwd(&buf));
-}
-test "getCwdAlloc" {
-    // at least call it so it gets compiled
-    var buf: [1000]u8 = undefined;
-    const allocator = &std.heap.FixedBufferAllocator.init(&buf).allocator;
-    _ = getCwdAlloc(allocator) catch {};
-}
 // here we replace the standard +/ with -_ so that it can be used in a file name
 const b64_fs_encoder = base64.Base64Encoder.init("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_", base64.standard_pad_char);
 @@ -260,17 +242,17 @@ pub fn makePath(allocator: *Allocator, full_path: []const u8) !void {
 /// Returns `error.DirNotEmpty` if the directory is not empty.
 /// To delete a directory recursively, see `deleteTree`.
-pub fn deleteDir(dir_path: []const u8) DeleteDirError!void {
+pub fn deleteDir(dir_path: []const u8) !void {
     return os.rmdir(dir_path);
 }
 /// Same as `deleteDir` except the parameter is a null-terminated UTF8-encoded string.
-pub fn deleteDirC(dir_path: [*]const u8) DeleteDirError!void {
+pub fn deleteDirC(dir_path: [*]const u8) !void {
     return os.rmdirC(dir_path);
 }
 /// Same as `deleteDir` except the parameter is a null-terminated UTF16LE-encoded string.
-pub fn deleteDirW(dir_path: [*]const u16) DeleteDirError!void {
+pub fn deleteDirW(dir_path: [*]const u16) !void {
     return os.rmdirW(dir_path);
 }
 @@ -362,7 +344,7 @@ pub fn deleteTree(allocator: *Allocator, full_path: []const u8) DeleteTreeError!
             };
             defer dir.close();
-            var full_entry_buf = ArrayList(u8).init(allocator);
+            var full_entry_buf = std.ArrayList(u8).init(allocator);
             defer full_entry_buf.deinit();
             while (try dir.next()) |entry| {

std/fs/file.zig+9-6

 @@ -137,24 +137,27 @@ pub const File = struct {
     /// Test for the existence of `path`.
     /// `path` is UTF8-encoded.
-    pub fn exists(path: []const u8) !void {
+    /// In general it is recommended to avoid this function. For example,
+    /// instead of testing if a file exists and then opening it, just
+    /// open it and handle the error for file not found.
+    pub fn access(path: []const u8) !void {
         return os.access(path, os.F_OK);
     }
-    /// Same as `exists` except the parameter is null-terminated.
+    /// Same as `access` except the parameter is null-terminated.
-    pub fn existsC(path: [*]const u8) !void {
+    pub fn accessC(path: [*]const u8) !void {
         return os.accessC(path, os.F_OK);
     }
-    /// Same as `exists` except the parameter is null-terminated UTF16LE-encoded.
+    /// Same as `access` except the parameter is null-terminated UTF16LE-encoded.
-    pub fn existsW(path: [*]const u16) !void {
+    pub fn accessW(path: [*]const u16) !void {
         return os.accessW(path, os.F_OK);
     }
     /// Upon success, the stream is in an uninitialized state. To continue using it,
     /// you must use the open() function.
     pub fn close(self: File) void {
-        os.close(self.handle);
+        return os.close(self.handle);
     }
     /// Test whether the file refers to a terminal.

std/fs/path.zig+8-7

...	@@ -9,6 +9,7 @@ const Allocator = mem.Allocator;	...	@@ -9,6 +9,7 @@ const Allocator = mem.Allocator;
9	const math = std.math;	9	const math = std.math;
10	const windows = std.os.windows;	10	const windows = std.os.windows;
11	const fs = std.fs;	11	const fs = std.fs;
		12	const process = std.process;
12		13
13	pub const sep_windows = '\\';	14	pub const sep_windows = '\\';
14	pub const sep_posix = '/';	15	pub const sep_posix = '/';
...	@@ -390,7 +391,7 @@ pub fn resolve(allocator: *Allocator, paths: []const []const u8) ![]u8 {	...	@@ -390,7 +391,7 @@ pub fn resolve(allocator: *Allocator, paths: []const []const u8) ![]u8 {
390	pub fn resolveWindows(allocator: *Allocator, paths: []const []const u8) ![]u8 {	391	pub fn resolveWindows(allocator: *Allocator, paths: []const []const u8) ![]u8 {
391	if (paths.len == 0) {	392	if (paths.len == 0) {
392	assert(windows.is_the_target); // resolveWindows called on non windows can't use getCwd	393	assert(windows.is_the_target); // resolveWindows called on non windows can't use getCwd
393	return fs.getCwdAlloc(allocator);	394	return process.getCwdAlloc(allocator);
394	}	395	}
395		396
396	// determine which disk designator we will result with, if any	397	// determine which disk designator we will result with, if any
...	@@ -485,7 +486,7 @@ pub fn resolveWindows(allocator: *Allocator, paths: []const []const u8) ![]u8 {	...	@@ -485,7 +486,7 @@ pub fn resolveWindows(allocator: *Allocator, paths: []const []const u8) ![]u8 {
485	},	486	},
486	WindowsPath.Kind.None => {	487	WindowsPath.Kind.None => {
487	assert(windows.is_the_target); // resolveWindows called on non windows can't use getCwd	488	assert(windows.is_the_target); // resolveWindows called on non windows can't use getCwd
488	const cwd = try fs.getCwdAlloc(allocator);	489	const cwd = try process.getCwdAlloc(allocator);
489	defer allocator.free(cwd);	490	defer allocator.free(cwd);
490	const parsed_cwd = windowsParsePath(cwd);	491	const parsed_cwd = windowsParsePath(cwd);
491	result = try allocator.alloc(u8, max_size + parsed_cwd.disk_designator.len + 1);	492	result = try allocator.alloc(u8, max_size + parsed_cwd.disk_designator.len + 1);
...	@@ -501,7 +502,7 @@ pub fn resolveWindows(allocator: *Allocator, paths: []const []const u8) ![]u8 {	...	@@ -501,7 +502,7 @@ pub fn resolveWindows(allocator: *Allocator, paths: []const []const u8) ![]u8 {
501	} else {	502	} else {
502	assert(windows.is_the_target); // resolveWindows called on non windows can't use getCwd	503	assert(windows.is_the_target); // resolveWindows called on non windows can't use getCwd
503	// TODO call get cwd for the result_disk_designator instead of the global one	504	// TODO call get cwd for the result_disk_designator instead of the global one
504	const cwd = try fs.getCwdAlloc(allocator);	505	const cwd = try process.getCwdAlloc(allocator);
505	defer allocator.free(cwd);	506	defer allocator.free(cwd);
506		507
507	result = try allocator.alloc(u8, max_size + cwd.len + 1);	508	result = try allocator.alloc(u8, max_size + cwd.len + 1);
...	@@ -571,7 +572,7 @@ pub fn resolveWindows(allocator: *Allocator, paths: []const []const u8) ![]u8 {	...	@@ -571,7 +572,7 @@ pub fn resolveWindows(allocator: *Allocator, paths: []const []const u8) ![]u8 {
571	pub fn resolvePosix(allocator: *Allocator, paths: []const []const u8) ![]u8 {	572	pub fn resolvePosix(allocator: *Allocator, paths: []const []const u8) ![]u8 {
572	if (paths.len == 0) {	573	if (paths.len == 0) {
573	assert(!windows.is_the_target); // resolvePosix called on windows can't use getCwd	574	assert(!windows.is_the_target); // resolvePosix called on windows can't use getCwd
574	return fs.getCwdAlloc(allocator);	575	return process.getCwdAlloc(allocator);
575	}	576	}
576		577
577	var first_index: usize = 0;	578	var first_index: usize = 0;
...	@@ -593,7 +594,7 @@ pub fn resolvePosix(allocator: *Allocator, paths: []const []const u8) ![]u8 {	...	@@ -593,7 +594,7 @@ pub fn resolvePosix(allocator: *Allocator, paths: []const []const u8) ![]u8 {
593	result = try allocator.alloc(u8, max_size);	594	result = try allocator.alloc(u8, max_size);
594	} else {	595	} else {
595	assert(!windows.is_the_target); // resolvePosix called on windows can't use getCwd	596	assert(!windows.is_the_target); // resolvePosix called on windows can't use getCwd
596	const cwd = try fs.getCwdAlloc(allocator);	597	const cwd = try process.getCwdAlloc(allocator);
597	defer allocator.free(cwd);	598	defer allocator.free(cwd);
598	result = try allocator.alloc(u8, max_size + cwd.len + 1);	599	result = try allocator.alloc(u8, max_size + cwd.len + 1);
599	mem.copy(u8, result, cwd);	600	mem.copy(u8, result, cwd);
...	@@ -632,7 +633,7 @@ pub fn resolvePosix(allocator: *Allocator, paths: []const []const u8) ![]u8 {	...	@@ -632,7 +633,7 @@ pub fn resolvePosix(allocator: *Allocator, paths: []const []const u8) ![]u8 {
632	}	633	}
633		634
634	test "resolve" {	635	test "resolve" {
635	const cwd = try fs.getCwdAlloc(debug.global_allocator);	636	const cwd = try process.getCwdAlloc(debug.global_allocator);
636	if (windows.is_the_target) {	637	if (windows.is_the_target) {
637	if (windowsParsePath(cwd).kind == WindowsPath.Kind.Drive) {	638	if (windowsParsePath(cwd).kind == WindowsPath.Kind.Drive) {
638	cwd[0] = asciiUpper(cwd[0]);	639	cwd[0] = asciiUpper(cwd[0]);
...	@@ -646,7 +647,7 @@ test "resolve" {	...	@@ -646,7 +647,7 @@ test "resolve" {
646		647
647	test "resolveWindows" {	648	test "resolveWindows" {
648	if (windows.is_the_target) {	649	if (windows.is_the_target) {
649	const cwd = try fs.getCwdAlloc(debug.global_allocator);	650	const cwd = try process.getCwdAlloc(debug.global_allocator);
650	const parsed_cwd = windowsParsePath(cwd);	651	const parsed_cwd = windowsParsePath(cwd);
651	{	652	{
652	const result = testResolveWindows([][]const u8{ "/usr/local", "lib\\zig\\std\\array_list.zig" });	653	const result = testResolveWindows([][]const u8{ "/usr/local", "lib\\zig\\std\\array_list.zig" });

std/heap.zig+1-1

...	@@ -112,7 +112,7 @@ pub const DirectAllocator = struct {	...	@@ -112,7 +112,7 @@ pub const DirectAllocator = struct {
112	-1,	112	-1,
113	0,	113	0,
114	) catch return error.OutOfMemory;	114	) catch return error.OutOfMemory;
115	if (alloc_size == n) return slice;	115	if (alloc_size == n) return slice[0..n];
116		116
117	const aligned_addr = mem.alignForward(@ptrToInt(slice.ptr), alignment);	117	const aligned_addr = mem.alignForward(@ptrToInt(slice.ptr), alignment);
118		118

std/io/test.zig+4-4

std/os.zig+40-31

 @@ -284,7 +284,7 @@ pub fn read(fd: fd_t, buf: []u8) ReadError!usize {
 /// Number of bytes read is returned. Upon reading end-of-file, zero is returned.
 /// This function is for blocking file descriptors only. For non-blocking, see
 /// `preadvAsync`.
-pub fn preadv(fd: fd_t, iov: [*]const iovec, count: usize, offset: u64) ReadError!usize {
+pub fn preadv(fd: fd_t, iov: []const iovec, offset: u64) ReadError!usize {
     if (darwin.is_the_target) {
         // Darwin does not have preadv but it does have pread.
         var off: usize = 0;
 @@ -301,7 +301,7 @@ pub fn preadv(fd: fd_t, iov: [*]const iovec, count: usize, offset: u64) ReadErro
                     if (inner_off == v.iov_len) {
                         iov_i += 1;
                         inner_off = 0;
-                        if (iov_i == count) {
+                        if (iov_i == iov.len) {
                             return off;
                         }
                     }
 @@ -323,9 +323,10 @@ pub fn preadv(fd: fd_t, iov: [*]const iovec, count: usize, offset: u64) ReadErro
         }
     }
     while (true) {
-        const rc = system.preadv(fd, iov, count, offset);
+        // TODO handle the case when iov_len is too large and get rid of this @intCast
+        const rc = system.preadv(fd, iov.ptr, @intCast(u32, iov.len), offset);
         switch (errno(rc)) {
-            0 => return rc,
+            0 => return @bitCast(usize, rc),
             EINTR => continue,
             EINVAL => unreachable,
             EFAULT => unreachable,
 @@ -407,7 +408,7 @@ pub fn write(fd: fd_t, bytes: []const u8) WriteError!void {
 /// Write multiple buffers to a file descriptor. Keeps trying if it gets interrupted.
 /// This function is for blocking file descriptors only. For non-blocking, see
 /// `pwritevAsync`.
-pub fn pwritev(fd: fd_t, iov: [*]const iovec_const, count: usize, offset: u64) WriteError!void {
+pub fn pwritev(fd: fd_t, iov: []const iovec_const, offset: u64) WriteError!void {
     if (darwin.is_the_target) {
         // Darwin does not have pwritev but it does have pwrite.
         var off: usize = 0;
 @@ -424,7 +425,7 @@ pub fn pwritev(fd: fd_t, iov: [*]const iovec_const, count: usize, offset: u64) W
                     if (inner_off == v.iov_len) {
                         iov_i += 1;
                         inner_off = 0;
-                        if (iov_i == count) {
+                        if (iov_i == iov.len) {
                             return;
                         }
                     }
 @@ -449,7 +450,8 @@ pub fn pwritev(fd: fd_t, iov: [*]const iovec_const, count: usize, offset: u64) W
     }
     while (true) {
-        const rc = system.pwritev(fd, iov, count, offset);
+        // TODO handle the case when iov_len is too large and get rid of this @intCast
+        const rc = system.pwritev(fd, iov.ptr, @intCast(u32, iov.len), offset);
         switch (errno(rc)) {
             0 => return,
             EINTR => continue,
 @@ -724,7 +726,7 @@ pub fn getcwd(out_buffer: []u8) GetCwdError![]u8 {
         EINVAL => unreachable,
         ENOENT => return error.CurrentWorkingDirectoryUnlinked,
         ERANGE => return error.NameTooLong,
-        else => return unexpectedErrno(err),
+        else => return unexpectedErrno(@intCast(usize, err)),
     }
 }
 @@ -1121,7 +1123,7 @@ pub fn readlinkC(file_path: [*]const u8, out_buffer: []u8) ReadLinkError![]u8 {
     }
     const rc = system.readlink(file_path, out_buffer.ptr, out_buffer.len);
     switch (errno(rc)) {
-        0 => return out_buffer[0..rc],
+        0 => return out_buffer[0..@bitCast(usize, rc)],
         EACCES => return error.AccessDenied,
         EFAULT => unreachable,
         EINVAL => unreachable,
 @@ -1307,7 +1309,7 @@ pub const BindError = error{
 /// addr is `*const T` where T is one of the sockaddr
 pub fn bind(fd: i32, addr: *const sockaddr) BindError!void {
-    const rc = system.bind(fd, system, @sizeOf(sockaddr));
+    const rc = system.bind(fd, addr, @sizeOf(sockaddr));
     switch (errno(rc)) {
         0 => return,
         EACCES => return error.AccessDenied,
 @@ -1521,7 +1523,7 @@ pub fn epoll_wait(epfd: i32, events: []epoll_event, timeout: i32) usize {
         // TODO get rid of the @intCast
         const rc = system.epoll_wait(epfd, events.ptr, @intCast(u32, events.len), timeout);
         switch (errno(rc)) {
-            0 => return rc,
+            0 => return @intCast(usize, rc),
             EINTR => continue,
             EBADF => unreachable,
             EFAULT => unreachable,
 @@ -1613,12 +1615,10 @@ pub const ConnectError = error{
 /// Initiate a connection on a socket.
 /// This is for blocking file descriptors only.
 /// For non-blocking, see `connect_async`.
-pub fn connect(sockfd: i32, sockaddr: *const sockaddr) ConnectError!void {
+pub fn connect(sockfd: i32, sock_addr: *sockaddr, len: socklen_t) ConnectError!void {
     while (true) {
-        switch (errno(system.connect(sockfd, sockaddr, @sizeOf(sockaddr)))) {
+        switch (errno(system.connect(sockfd, sock_addr, @sizeOf(sockaddr)))) {
             0 => return,
-            else => |err| return unexpectedErrno(err),
             EACCES => return error.PermissionDenied,
             EPERM => return error.PermissionDenied,
             EADDRINUSE => return error.AddressInUse,
 @@ -1636,19 +1636,18 @@ pub fn connect(sockfd: i32, sockaddr: *const sockaddr) ConnectError!void {
             ENOTSOCK => unreachable, // The file descriptor sockfd does not refer to a socket.
             EPROTOTYPE => unreachable, // The socket type does not support the requested communications protocol.
             ETIMEDOUT => return error.ConnectionTimedOut,
+            else => |err| return unexpectedErrno(err),
         }
     }
 }
 /// Same as `connect` except it is for blocking socket file descriptors.
 /// It expects to receive EINPROGRESS`.
-pub fn connect_async(sockfd: i32, sockaddr: *const c_void, len: u32) ConnectError!void {
+pub fn connect_async(sockfd: i32, sock_addr: *sockaddr, len: socklen_t) ConnectError!void {
     while (true) {
-        switch (errno(system.connect(sockfd, sockaddr, len))) {
+        switch (errno(system.connect(sockfd, sock_addr, @sizeOf(sockaddr)))) {
-            0, EINPROGRESS => return,
             EINTR => continue,
-            else => |err| return unexpectedErrno(err),
+            0, EINPROGRESS => return,
             EACCES => return error.PermissionDenied,
             EPERM => return error.PermissionDenied,
             EADDRINUSE => return error.AddressInUse,
 @@ -1664,13 +1663,14 @@ pub fn connect_async(sockfd: i32, sockaddr: *const c_void, len: u32) ConnectErro
             ENOTSOCK => unreachable, // The file descriptor sockfd does not refer to a socket.
             EPROTOTYPE => unreachable, // The socket type does not support the requested communications protocol.
             ETIMEDOUT => return error.ConnectionTimedOut,
+            else => |err| return unexpectedErrno(err),
         }
     }
 }
 pub fn getsockoptError(sockfd: i32) ConnectError!void {
-    var err_code: i32 = undefined;
+    var err_code: u32 = undefined;
-    var size: u32 = @sizeOf(i32);
+    var size: u32 = @sizeOf(u32);
     const rc = system.getsockopt(sockfd, SOL_SOCKET, SO_ERROR, @ptrCast([*]u8, &err_code), &size);
     assert(size == 4);
     switch (errno(rc)) {
 @@ -1702,11 +1702,13 @@ pub fn getsockoptError(sockfd: i32) ConnectError!void {
     }
 }
-pub fn waitpid(pid: i32, flags: u32) i32 {
+pub fn waitpid(pid: i32, flags: u32) u32 {
-    var status: i32 = undefined;
+    // TODO allow implicit pointer cast from *u32 to *c_uint ?
+    const Status = if (builtin.link_libc) c_uint else u32;
+    var status: Status = undefined;
     while (true) {
         switch (errno(system.waitpid(pid, &status, flags))) {
-            0 => return status,
+            0 => return @bitCast(u32, status),
             EINTR => continue,
             ECHILD => unreachable, // The process specified does not exist. It would be a race condition to handle this error.
             EINVAL => unreachable, // The options argument was invalid
 @@ -1892,11 +1894,19 @@ pub fn fork() ForkError!pid_t {
 }
 pub const MMapError = error{
+    /// The underlying filesystem of the specified file does not support memory mapping.
+    MemoryMappingNotSupported,
+    /// A file descriptor refers to a non-regular file. Or a file mapping was requested,
+    /// but the file descriptor is not open for reading. Or `MAP_SHARED` was requested
+    /// and `PROT_WRITE` is set, but the file descriptor is not open in `O_RDWR` mode.
+    /// Or `PROT_WRITE` is set, but the file is append-only.
     AccessDenied,
+    /// The `prot` argument asks for `PROT_EXEC` but the mapped area belongs to a file on
+    /// a filesystem that was mounted no-exec.
     PermissionDenied,
     LockedMemoryLimitExceeded,
-    SystemFdQuotaExceeded,
-    MemoryMappingNotSupported,
     OutOfMemory,
     Unexpected,
 };
 @@ -1932,7 +1942,6 @@ pub fn mmap(
         EAGAIN => return error.LockedMemoryLimitExceeded,
         EBADF => unreachable, // Always a race condition.
         EOVERFLOW => unreachable, // The number of pages used for length + offset would overflow.
-        ENFILE => return error.SystemFdQuotaExceeded,
         ENODEV => return error.MemoryMappingNotSupported,
         EINVAL => unreachable, // Invalid parameters to mmap()
         ENOMEM => return error.OutOfMemory,
 @@ -2265,7 +2274,7 @@ pub fn realpathC(pathname: [*]const u8, out_buffer: *[MAX_PATH_BYTES]u8) RealPat
         ENAMETOOLONG => return error.NameTooLong,
         ELOOP => return error.SymLinkLoop,
         EIO => return error.InputOutput,
-        else => |err| return unexpectedErrno(err),
+        else => |err| return unexpectedErrno(@intCast(usize, err)),
     };
     return mem.toSlice(u8, result_path);
 }
 @@ -2349,7 +2358,7 @@ pub fn clock_gettime(clk_id: i32, tp: *timespec) ClockGetTimeError!void {
 }
 pub fn clock_getres(clk_id: i32, res: *timespec) ClockGetTimeError!void {
-    switch (errno(system.clock_getres(clk_id, tp))) {
+    switch (errno(system.clock_getres(clk_id, res))) {
         0 => return,
         EFAULT => unreachable,
         EINVAL => return error.UnsupportedClock,
 @@ -2364,7 +2373,7 @@ pub const SchedGetAffinityError = error{
 pub fn sched_getaffinity(pid: pid_t) SchedGetAffinityError!cpu_set_t {
     var set: cpu_set_t = undefined;
-    switch (errno(system.sched_getaffinity(pid, &set))) {
+    switch (errno(system.sched_getaffinity(pid, @sizeOf(cpu_set_t), &set))) {
         0 => return set,
         EFAULT => unreachable,
         EINVAL => unreachable,

std/os/bits/darwin.zig+8-8

...	@@ -219,7 +219,7 @@ pub const MAP_NOCACHE = 0x0400;	...	@@ -219,7 +219,7 @@ pub const MAP_NOCACHE = 0x0400;
219		219
220	/// don't reserve needed swap area	220	/// don't reserve needed swap area
221	pub const MAP_NORESERVE = 0x0040;	221	pub const MAP_NORESERVE = 0x0040;
222	pub const MAP_FAILED = maxInt(usize);	222	pub const MAP_FAILED = @intToPtr(*c_void, maxInt(usize));
223		223
224	/// [XSI] no hang in wait/no child to reap	224	/// [XSI] no hang in wait/no child to reap
225	pub const WNOHANG = 0x00000001;	225	pub const WNOHANG = 0x00000001;
...	@@ -749,26 +749,26 @@ pub const IPPROTO_UDP = 17;	...	@@ -749,26 +749,26 @@ pub const IPPROTO_UDP = 17;
749	pub const IPPROTO_IP = 0;	749	pub const IPPROTO_IP = 0;
750	pub const IPPROTO_IPV6 = 41;	750	pub const IPPROTO_IPV6 = 41;
751		751
752	fn wstatus(x: i32) i32 {	752	fn wstatus(x: u32) u32 {
753	return x & 0o177;	753	return x & 0o177;
754	}	754	}
755	const wstopped = 0o177;	755	const wstopped = 0o177;
756	pub fn WEXITSTATUS(x: i32) i32 {	756	pub fn WEXITSTATUS(x: u32) u32 {
757	return x >> 8;	757	return x >> 8;
758	}	758	}
759	pub fn WTERMSIG(x: i32) i32 {	759	pub fn WTERMSIG(x: u32) u32 {
760	return wstatus(x);	760	return wstatus(x);
761	}	761	}
762	pub fn WSTOPSIG(x: i32) i32 {	762	pub fn WSTOPSIG(x: u32) u32 {
763	return x >> 8;	763	return x >> 8;
764	}	764	}
765	pub fn WIFEXITED(x: i32) bool {	765	pub fn WIFEXITED(x: u32) bool {
766	return wstatus(x) == 0;	766	return wstatus(x) == 0;
767	}	767	}
768	pub fn WIFSTOPPED(x: i32) bool {	768	pub fn WIFSTOPPED(x: u32) bool {
769	return wstatus(x) == wstopped and WSTOPSIG(x) != 0x13;	769	return wstatus(x) == wstopped and WSTOPSIG(x) != 0x13;
770	}	770	}
771	pub fn WIFSIGNALED(x: i32) bool {	771	pub fn WIFSIGNALED(x: u32) bool {
772	return wstatus(x) != wstopped and wstatus(x) != 0;	772	return wstatus(x) != wstopped and wstatus(x) != 0;
773	}	773	}
774		774

std/os/bits/freebsd.zig+11-17

 @@ -161,7 +161,7 @@ pub const CLOCK_SECOND = 13;
 pub const CLOCK_THREAD_CPUTIME_ID = 14;
 pub const CLOCK_PROCESS_CPUTIME_ID = 15;
-pub const MAP_FAILED = maxInt(usize);
+pub const MAP_FAILED = @intToPtr(*c_void, maxInt(usize));
 pub const MAP_SHARED = 0x0001;
 pub const MAP_PRIVATE = 0x0002;
 pub const MAP_FIXED = 0x0010;
 @@ -644,29 +644,23 @@ pub const TIOCGPKT = 0x80045438;
 pub const TIOCGPTLCK = 0x80045439;
 pub const TIOCGEXCL = 0x80045440;
-fn unsigned(s: i32) u32 {
+pub fn WEXITSTATUS(s: u32) u32 {
-    return @bitCast(u32, s);
+    return (s & 0xff00) >> 8;
 }
-fn signed(s: u32) i32 {
+pub fn WTERMSIG(s: u32) u32 {
-    return @bitCast(i32, s);
+    return s & 0x7f;
 }
-pub fn WEXITSTATUS(s: i32) i32 {
+pub fn WSTOPSIG(s: u32) u32 {
-    return signed((unsigned(s) & 0xff00) >> 8);
-}
-pub fn WTERMSIG(s: i32) i32 {
-    return signed(unsigned(s) & 0x7f);
-}
-pub fn WSTOPSIG(s: i32) i32 {
     return WEXITSTATUS(s);
 }
-pub fn WIFEXITED(s: i32) bool {
+pub fn WIFEXITED(s: u32) bool {
     return WTERMSIG(s) == 0;
 }
-pub fn WIFSTOPPED(s: i32) bool {
+pub fn WIFSTOPPED(s: u32) bool {
-    return @intCast(u16, (((unsigned(s) & 0xffff) *% 0x10001) >> 8)) > 0x7f00;
+    return @intCast(u16, (((s & 0xffff) *% 0x10001) >> 8)) > 0x7f00;
 }
-pub fn WIFSIGNALED(s: i32) bool {
+pub fn WIFSIGNALED(s: u32) bool {
-    return (unsigned(s) & 0xffff) -% 1 < 0xff;
+    return (s & 0xffff) -% 1 < 0xff;
 }
 pub const winsize = extern struct {

std/os/bits/linux.zig+13-17

 @@ -1,5 +1,7 @@
+const builtin = @import("builtin");
 const std = @import("../../std.zig");
 const maxInt = std.math.maxInt;
+use @import("../bits.zig");
 pub use @import("linux/errno.zig");
 pub use switch (builtin.arch) {
 @@ -661,29 +663,23 @@ pub const TFD_CLOEXEC = O_CLOEXEC;
 pub const TFD_TIMER_ABSTIME = 1;
 pub const TFD_TIMER_CANCEL_ON_SET = (1 << 1);
-fn unsigned(s: i32) u32 {
+pub fn WEXITSTATUS(s: u32) u32 {
-    return @bitCast(u32, s);
+    return (s & 0xff00) >> 8;
 }
-fn signed(s: u32) i32 {
+pub fn WTERMSIG(s: u32) u32 {
-    return @bitCast(i32, s);
+    return s & 0x7f;
 }
-pub fn WEXITSTATUS(s: i32) i32 {
+pub fn WSTOPSIG(s: u32) u32 {
-    return signed((unsigned(s) & 0xff00) >> 8);
-}
-pub fn WTERMSIG(s: i32) i32 {
-    return signed(unsigned(s) & 0x7f);
-}
-pub fn WSTOPSIG(s: i32) i32 {
     return WEXITSTATUS(s);
 }
-pub fn WIFEXITED(s: i32) bool {
+pub fn WIFEXITED(s: u32) bool {
     return WTERMSIG(s) == 0;
 }
-pub fn WIFSTOPPED(s: i32) bool {
+pub fn WIFSTOPPED(s: u32) bool {
-    return @intCast(u16, ((unsigned(s) & 0xffff) *% 0x10001) >> 8) > 0x7f00;
+    return @intCast(u16, ((s & 0xffff) *% 0x10001) >> 8) > 0x7f00;
 }
-pub fn WIFSIGNALED(s: i32) bool {
+pub fn WIFSIGNALED(s: u32) bool {
-    return (unsigned(s) & 0xffff) -% 1 < 0xff;
+    return (s & 0xffff) -% 1 < 0xff;
 }
 pub const winsize = extern struct {
 @@ -902,7 +898,7 @@ pub const dirent64 = extern struct {
 pub const dl_phdr_info = extern struct {
     dlpi_addr: usize,
     dlpi_name: ?[*]const u8,
-    dlpi_phdr: [*]elf.Phdr,
+    dlpi_phdr: [*]std.elf.Phdr,
     dlpi_phnum: u16,
 };

std/os/bits/netbsd.zig+10-16

 @@ -152,7 +152,7 @@ pub const CLOCK_MONOTONIC = 3;
 pub const CLOCK_THREAD_CPUTIME_ID = 0x20000000;
 pub const CLOCK_PROCESS_CPUTIME_ID = 0x40000000;
-pub const MAP_FAILED = maxInt(usize);
+pub const MAP_FAILED = @intToPtr(*c_void, maxInt(usize));
 pub const MAP_SHARED = 0x0001;
 pub const MAP_PRIVATE = 0x0002;
 pub const MAP_REMAPDUP = 0x0004;
 @@ -516,34 +516,28 @@ pub const TIOCSWINSZ = 0x80087467;
 pub const TIOCUCNTL = 0x80047466;
 pub const TIOCXMTFRAME = 0x80087444;
-fn unsigned(s: i32) u32 {
+pub fn WEXITSTATUS(s: u32) u32 {
-    return @bitCast(u32, s);
+    return (s >> 8) & 0xff;
 }
-fn signed(s: u32) i32 {
+pub fn WTERMSIG(s: u32) u32 {
-    return @bitCast(i32, s);
+    return s & 0x7f;
 }
-pub fn WEXITSTATUS(s: i32) i32 {
+pub fn WSTOPSIG(s: u32) u32 {
-    return signed((unsigned(s) >> 8) & 0xff);
-}
-pub fn WTERMSIG(s: i32) i32 {
-    return signed(unsigned(s) & 0x7f);
-}
-pub fn WSTOPSIG(s: i32) i32 {
     return WEXITSTATUS(s);
 }
-pub fn WIFEXITED(s: i32) bool {
+pub fn WIFEXITED(s: u32) bool {
     return WTERMSIG(s) == 0;
 }
-pub fn WIFCONTINUED(s: i32) bool {
+pub fn WIFCONTINUED(s: u32) bool {
     return ((s & 0x7f) == 0xffff);
 }
-pub fn WIFSTOPPED(s: i32) bool {
+pub fn WIFSTOPPED(s: u32) bool {
     return ((s & 0x7f != 0x7f) and !WIFCONTINUED(s));
 }
-pub fn WIFSIGNALED(s: i32) bool {
+pub fn WIFSIGNALED(s: u32) bool {
     return !WIFSTOPPED(s) and !WIFCONTINUED(s) and !WIFEXITED(s);
 }

std/os/linux.zig+1-1

...	@@ -382,7 +382,7 @@ pub fn unlinkat(dirfd: i32, path: [*]const u8, flags: u32) usize {	...	@@ -382,7 +382,7 @@ pub fn unlinkat(dirfd: i32, path: [*]const u8, flags: u32) usize {
382	return syscall3(SYS_unlinkat, @bitCast(usize, isize(dirfd)), @ptrToInt(path), flags);	382	return syscall3(SYS_unlinkat, @bitCast(usize, isize(dirfd)), @ptrToInt(path), flags);
383	}	383	}
384		384
385	pub fn waitpid(pid: i32, status: *i32, flags: u32) usize {	385	pub fn waitpid(pid: i32, status: *u32, flags: u32) usize {
386	return syscall4(SYS_wait4, @bitCast(usize, isize(pid)), @ptrToInt(status), flags, 0);	386	return syscall4(SYS_wait4, @bitCast(usize, isize(pid)), @ptrToInt(status), flags, 0);
387	}	387	}
388		388

std/os/linux/test.zig+1-1

...	@@ -11,7 +11,7 @@ test "getpid" {	...	@@ -11,7 +11,7 @@ test "getpid" {
11		11
12	test "timer" {	12	test "timer" {
13	const epoll_fd = linux.epoll_create();	13	const epoll_fd = linux.epoll_create();
14	var err = linux.getErrno(epoll_fd);	14	var err: usize = linux.getErrno(epoll_fd);
15	expect(err == 0);	15	expect(err == 0);
16		16
17	const timer_fd = linux.timerfd_create(linux.CLOCK_MONOTONIC, 0);	17	const timer_fd = linux.timerfd_create(linux.CLOCK_MONOTONIC, 0);

std/os/linux/vdso.zig+1-1

...	@@ -5,7 +5,7 @@ const mem = std.mem;	...	@@ -5,7 +5,7 @@ const mem = std.mem;
5	const maxInt = std.math.maxInt;	5	const maxInt = std.math.maxInt;
6		6
7	pub fn lookup(vername: []const u8, name: []const u8) usize {	7	pub fn lookup(vername: []const u8, name: []const u8) usize {
8	const vdso_addr = std.os.linuxGetAuxVal(std.elf.AT_SYSINFO_EHDR);	8	const vdso_addr = std.os.system.getauxval(std.elf.AT_SYSINFO_EHDR);
9	if (vdso_addr == 0) return 0;	9	if (vdso_addr == 0) return 0;
10		10
11	const eh = @intToPtr(*elf.Ehdr, vdso_addr);	11	const eh = @intToPtr(*elf.Ehdr, vdso_addr);

std/os/test.zig+16-19

 @@ -15,11 +15,11 @@ const AtomicRmwOp = builtin.AtomicRmwOp;
 const AtomicOrder = builtin.AtomicOrder;
 test "makePath, put some files in it, deleteTree" {
-    try os.makePath(a, "os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "c");
+    try fs.makePath(a, "os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "c");
     try io.writeFile("os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "c" ++ fs.path.sep_str ++ "file.txt", "nonsense");
     try io.writeFile("os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "file2.txt", "blah");
-    try os.deleteTree(a, "os_test_tmp");
+    try fs.deleteTree(a, "os_test_tmp");
-    if (os.Dir.open(a, "os_test_tmp")) |dir| {
+    if (fs.Dir.open(a, "os_test_tmp")) |dir| {
         @panic("expected error");
     } else |err| {
         expect(err == error.FileNotFound);
 @@ -27,7 +27,7 @@ test "makePath, put some files in it, deleteTree" {
 }
 test "access file" {
-    try os.makePath(a, "os_test_tmp");
+    try fs.makePath(a, "os_test_tmp");
     if (File.access("os_test_tmp" ++ fs.path.sep_str ++ "file.txt")) |ok| {
         @panic("expected error");
     } else |err| {
 @@ -35,8 +35,8 @@ test "access file" {
     }
     try io.writeFile("os_test_tmp" ++ fs.path.sep_str ++ "file.txt", "");
-    try File.access("os_test_tmp" ++ fs.path.sep_str ++ "file.txt");
+    try os.access("os_test_tmp" ++ fs.path.sep_str ++ "file.txt", os.F_OK);
-    try os.deleteTree(a, "os_test_tmp");
+    try fs.deleteTree(a, "os_test_tmp");
 }
 fn testThreadIdFn(thread_id: *Thread.Id) void {
 @@ -52,15 +52,12 @@ test "std.Thread.getCurrentId" {
     thread.wait();
     if (Thread.use_pthreads) {
         expect(thread_current_id == thread_id);
+    } else if (os.windows.is_the_target) {
+        expect(Thread.getCurrentId() != thread_current_id);
     } else {
-        switch (builtin.os) {
+        // If the thread completes very quickly, then thread_id can be 0. See the
-            builtin.Os.windows => expect(Thread.getCurrentId() != thread_current_id),
+        // documentation comments for `std.Thread.handle`.
-            else => {
+        expect(thread_id == 0 or thread_current_id == thread_id);
-                // If the thread completes very quickly, then thread_id can be 0. See the
-                // documentation comments for `std.Thread.handle`.
-                expect(thread_id == 0 or thread_current_id == thread_id);
-            },
-        }
     }
 }
 @@ -92,7 +89,7 @@ fn start2(ctx: *i32) u8 {
 }
 test "cpu count" {
-    const cpu_count = try std.os.cpuCount(a);
+    const cpu_count = try Thread.cpuCount();
     expect(cpu_count >= 1);
 }
 @@ -105,7 +102,7 @@ test "AtomicFile" {
         \\ this is a test file
     ;
     {
-        var af = try os.AtomicFile.init(test_out_file, File.default_mode);
+        var af = try fs.AtomicFile.init(test_out_file, File.default_mode);
         defer af.deinit();
         try af.file.write(test_content);
         try af.finish();
 @@ -113,7 +110,7 @@ test "AtomicFile" {
     const content = try io.readFileAlloc(allocator, test_out_file);
     expect(mem.eql(u8, content, test_content));
-    try os.deleteFile(test_out_file);
+    try fs.deleteFile(test_out_file);
 }
 test "thread local storage" {
 @@ -145,10 +142,10 @@ test "getrandom" {
 test "getcwd" {
     // at least call it so it gets compiled
     var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
-    _ = os.getcwd(&buf) catch {};
+    _ = os.getcwd(&buf) catch undefined;
 }
 test "realpath" {
     var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
-    testing.expectError(error.FileNotFound, os.realpath("definitely_bogus_does_not_exist1234", &buf));
+    testing.expectError(error.FileNotFound, fs.realpath("definitely_bogus_does_not_exist1234", &buf));
 }

std/os/windows.zig+38

...	@@ -1180,6 +1180,44 @@ pub fn CreateProcessW(	...	@@ -1180,6 +1180,44 @@ pub fn CreateProcessW(
1180	}	1180	}
1181	}	1181	}
1182		1182
		1183	pub const LoadLibraryError = error{
		1184	FileNotFound,
		1185	Unexpected,
		1186	};
		1187
		1188	pub fn LoadLibraryW(lpLibFileName: [*]const u16) LoadLibraryError!HMODULE {
		1189	return kernel32.LoadLibraryW(lpLibFileName) orelse {
		1190	switch (kernel32.GetLastError()) {
		1191	ERROR.FILE_NOT_FOUND => return error.FileNotFound,
		1192	ERROR.PATH_NOT_FOUND => return error.FileNotFound,
		1193	ERROR.MOD_NOT_FOUND => return error.FileNotFound,
		1194	else => \|err\| return unexpectedError(err),
		1195	}
		1196	};
		1197	}
		1198
		1199	pub fn FreeLibrary(hModule: HMODULE) void {
		1200	assert(kernel32.FreeLibrary(hModule) != 0);
		1201	}
		1202
		1203	pub fn QueryPerformanceFrequency() u64 {
		1204	// "On systems that run Windows XP or later, the function will always succeed"
		1205	// https://docs.microsoft.com/en-us/windows/desktop/api/profileapi/nf-profileapi-queryperformancefrequency
		1206	var result: LARGE_INTEGER = undefined;
		1207	assert(kernel32.QueryPerformanceFrequency(&result) != 0);
		1208	// The kernel treats this integer as unsigned.
		1209	return @bitCast(u64, result);
		1210	}
		1211
		1212	pub fn QueryPerformanceCounter() u64 {
		1213	// "On systems that run Windows XP or later, the function will always succeed"
		1214	// https://docs.microsoft.com/en-us/windows/desktop/api/profileapi/nf-profileapi-queryperformancecounter
		1215	var result: LARGE_INTEGER = undefined;
		1216	assert(kernel32.QueryPerformanceCounter(&result) != 0);
		1217	// The kernel treats this integer as unsigned.
		1218	return @bitCast(u64, result);
		1219	}
		1220
1183	pub fn cStrToPrefixedFileW(s: [*]const u8) ![PATH_MAX_WIDE + 1]u16 {	1221	pub fn cStrToPrefixedFileW(s: [*]const u8) ![PATH_MAX_WIDE + 1]u16 {
1184	return sliceToPrefixedFileW(mem.toSliceConst(u8, s));	1222	return sliceToPrefixedFileW(mem.toSliceConst(u8, s));
1185	}	1223	}

std/os/zen.zig+1-1

...	@@ -80,7 +80,7 @@ pub const STDOUT_FILENO = 1;	...	@@ -80,7 +80,7 @@ pub const STDOUT_FILENO = 1;
80	pub const STDERR_FILENO = 2;	80	pub const STDERR_FILENO = 2;
81		81
82	// FIXME: let's borrow Linux's error numbers for now.	82	// FIXME: let's borrow Linux's error numbers for now.
83	use @import("../bits/linux/errno.zig");	83	use @import("bits/linux/errno.zig");
84	// Get the errno from a syscall return value, or 0 for no error.	84	// Get the errno from a syscall return value, or 0 for no error.
85	pub fn getErrno(r: usize) usize {	85	pub fn getErrno(r: usize) usize {
86	const signed_r = @bitCast(isize, r);	86	const signed_r = @bitCast(isize, r);

std/process.zig+21-1

...	@@ -1,7 +1,9 @@	...	@@ -1,7 +1,9 @@
1	const builtin = @import("builtin");	1	const builtin = @import("builtin");
2	const std = @import("std.zig");	2	const std = @import("std.zig");
3	const os = std.os;	3	const os = std.os;
		4	const fs = std.fs;
4	const BufMap = std.BufMap;	5	const BufMap = std.BufMap;
		6	const Buffer = std.Buffer;
5	const mem = std.mem;	7	const mem = std.mem;
6	const math = std.math;	8	const math = std.math;
7	const Allocator = mem.Allocator;	9	const Allocator = mem.Allocator;
...	@@ -13,6 +15,24 @@ pub const exit = os.exit;	...	@@ -13,6 +15,24 @@ pub const exit = os.exit;
13	pub const changeCurDir = os.chdir;	15	pub const changeCurDir = os.chdir;
14	pub const changeCurDirC = os.chdirC;	16	pub const changeCurDirC = os.chdirC;
15		17
		18	/// The result is a slice of `out_buffer`, from index `0`.
		19	pub fn getCwd(out_buffer: *[fs.MAX_PATH_BYTES]u8) ![]u8 {
		20	return os.getcwd(out_buffer);
		21	}
		22
		23	/// Caller must free the returned memory.
		24	pub fn getCwdAlloc(allocator: *Allocator) ![]u8 {
		25	var buf: [fs.MAX_PATH_BYTES]u8 = undefined;
		26	return mem.dupe(allocator, u8, try os.getcwd(&buf));
		27	}
		28
		29	test "getCwdAlloc" {
		30	// at least call it so it gets compiled
		31	var buf: [1000]u8 = undefined;
		32	const allocator = &std.heap.FixedBufferAllocator.init(&buf).allocator;
		33	_ = getCwdAlloc(allocator) catch undefined;
		34	}
		35
16	/// Caller must free result when done.	36	/// Caller must free result when done.
17	/// TODO make this go through libc when we have it	37	/// TODO make this go through libc when we have it
18	pub fn getEnvMap(allocator: *Allocator) !BufMap {	38	pub fn getEnvMap(allocator: *Allocator) !BufMap {
...	@@ -402,7 +422,7 @@ pub fn argsAlloc(allocator: *mem.Allocator) ![]const []u8 {	...	@@ -402,7 +422,7 @@ pub fn argsAlloc(allocator: *mem.Allocator) ![]const []u8 {
402	var contents = try Buffer.initSize(allocator, 0);	422	var contents = try Buffer.initSize(allocator, 0);
403	defer contents.deinit();	423	defer contents.deinit();
404		424
405	var slice_list = ArrayList(usize).init(allocator);	425	var slice_list = std.ArrayList(usize).init(allocator);
406	defer slice_list.deinit();	426	defer slice_list.deinit();
407		427
408	while (it.next(allocator)) \|arg_or_err\| {	428	while (it.next(allocator)) \|arg_or_err\| {

std/thread.zig+36-20

 @@ -1,8 +1,10 @@
 const builtin = @import("builtin");
 const std = @import("std.zig");
 const os = std.os;
+const mem = std.mem;
 const windows = std.os.windows;
 const c = std.c;
+const assert = std.debug.assert;
 pub const Thread = struct {
     data: Data,
 @@ -31,14 +33,12 @@ pub const Thread = struct {
     pub const Data = if (use_pthreads)
         struct {
             handle: Thread.Handle,
-            mmap_addr: usize,
+            memory: []align(mem.page_size) u8,
-            mmap_len: usize,
         }
     else switch (builtin.os) {
         .linux => struct {
             handle: Thread.Handle,
-            mmap_addr: usize,
+            memory: []align(mem.page_size) u8,
-            mmap_len: usize,
         },
         .windows => struct {
             handle: Thread.Handle,
 @@ -56,7 +56,7 @@ pub const Thread = struct {
             return c.pthread_self();
         } else
             return switch (builtin.os) {
-            .linux => linux.gettid(),
+            .linux => os.linux.gettid(),
             .windows => windows.GetCurrentThreadId(),
             else => @compileError("Unsupported OS"),
         };
 @@ -82,21 +82,21 @@ pub const Thread = struct {
                 os.EDEADLK => unreachable,
                 else => unreachable,
             }
-            os.munmap(self.data.mmap_addr, self.data.mmap_len);
+            os.munmap(self.data.memory);
         } else switch (builtin.os) {
             .linux => {
                 while (true) {
                     const pid_value = @atomicLoad(i32, &self.data.handle, .SeqCst);
                     if (pid_value == 0) break;
-                    const rc = linux.futex_wait(&self.data.handle, linux.FUTEX_WAIT, pid_value, null);
+                    const rc = os.linux.futex_wait(&self.data.handle, os.linux.FUTEX_WAIT, pid_value, null);
-                    switch (linux.getErrno(rc)) {
+                    switch (os.linux.getErrno(rc)) {
                         0 => continue,
                         os.EINTR => continue,
                         os.EAGAIN => continue,
                         else => unreachable,
                     }
                 }
-                os.munmap(self.data.mmap_addr, self.data.mmap_len);
+                os.munmap(self.data.memory);
             },
             .windows => {
                 assert(windows.WaitForSingleObject(self.data.handle, windows.INFINITE) == windows.WAIT_OBJECT_0);
 @@ -130,6 +130,10 @@ pub const Thread = struct {
         /// Not enough userland memory to spawn the thread.
         OutOfMemory,
+        /// `mlockall` is enabled, and the memory needed to spawn the thread
+        /// would exceed the limit.
+        LockedMemoryLimitExceeded,
         Unexpected,
     };
 @@ -219,7 +223,7 @@ pub const Thread = struct {
             }
         };
-        const MAP_GROWSDOWN = if (builtin.os == .linux) linux.MAP_GROWSDOWN else 0;
+        const MAP_GROWSDOWN = if (os.linux.is_the_target) os.linux.MAP_GROWSDOWN else 0;
         var stack_end_offset: usize = undefined;
         var thread_start_offset: usize = undefined;
 @@ -241,7 +245,7 @@ pub const Thread = struct {
             }
             // Finally, the Thread Local Storage, if any.
             if (!Thread.use_pthreads) {
-                if (linux.tls.tls_image) |tls_img| {
+                if (os.linux.tls.tls_image) |tls_img| {
                     l = mem.alignForward(l, @alignOf(usize));
                     tls_start_offset = l;
                     l += tls_img.alloc_size;
 @@ -249,12 +253,24 @@ pub const Thread = struct {
             }
             break :blk l;
         };
-        const mmap_addr = try os.mmap(null, mmap_len, os.PROT_READ | os.PROT_WRITE, os.MAP_PRIVATE | os.MAP_ANONYMOUS | MAP_GROWSDOWN, -1, 0);
+        const mmap_slice = os.mmap(
-        errdefer os.munmap(mmap_addr, mmap_len);
+            null,
+            mem.alignForward(mmap_len, mem.page_size),
+            os.PROT_READ | os.PROT_WRITE,
+            os.MAP_PRIVATE | os.MAP_ANONYMOUS | MAP_GROWSDOWN,
+            -1,
+            0,
+        ) catch |err| switch (err) {
+            error.MemoryMappingNotSupported => unreachable, // no file descriptor
+            error.AccessDenied => unreachable, // no file descriptor
+            error.PermissionDenied => unreachable, // no file descriptor
+            else => |e| return e,
+        };
+        errdefer os.munmap(mmap_slice);
+        const mmap_addr = @ptrToInt(mmap_slice.ptr);
         const thread_ptr = @alignCast(@alignOf(Thread), @intToPtr(*Thread, mmap_addr + thread_start_offset));
-        thread_ptr.data.mmap_addr = mmap_addr;
+        thread_ptr.data.memory = mmap_slice;
-        thread_ptr.data.mmap_len = mmap_len;
         var arg: usize = undefined;
         if (@sizeOf(Context) != 0) {
 @@ -269,7 +285,7 @@ pub const Thread = struct {
             if (c.pthread_attr_init(&attr) != 0) return error.SystemResources;
             defer assert(c.pthread_attr_destroy(&attr) == 0);
-            assert(c.pthread_attr_setstack(&attr, @intToPtr(*c_void, mmap_addr), stack_end_offset) == 0);
+            assert(c.pthread_attr_setstack(&attr, mmap_slice.ptr, stack_end_offset) == 0);
             const err = c.pthread_create(&thread_ptr.data.handle, &attr, MainFuncs.posixThreadMain, @intToPtr(*c_void, arg));
             switch (err) {
 @@ -279,13 +295,13 @@ pub const Thread = struct {
                 os.EINVAL => unreachable,
                 else => return os.unexpectedErrno(@intCast(usize, err)),
             }
-        } else if (builtin.os == .linux) {
+        } else if (os.linux.is_the_target) {
             var flags: u32 = os.CLONE_VM | os.CLONE_FS | os.CLONE_FILES | os.CLONE_SIGHAND |
                 os.CLONE_THREAD | os.CLONE_SYSVSEM | os.CLONE_PARENT_SETTID | os.CLONE_CHILD_CLEARTID |
                 os.CLONE_DETACHED;
             var newtls: usize = undefined;
-            if (linux.tls.tls_image) |tls_img| {
+            if (os.linux.tls.tls_image) |tls_img| {
-                newtls = linux.tls.copyTLS(mmap_addr + tls_start_offset);
+                newtls = os.linux.tls.copyTLS(mmap_addr + tls_start_offset);
                 flags |= os.CLONE_SETTLS;
             }
             const rc = os.linux.clone(MainFuncs.linuxThreadMain, mmap_addr + stack_end_offset, flags, arg, &thread_ptr.data.handle, newtls, &thread_ptr.data.handle);
 @@ -313,7 +329,7 @@ pub const Thread = struct {
     pub fn cpuCount() CpuCountError!usize {
         if (os.linux.is_the_target) {
             const cpu_set = try os.sched_getaffinity(0);
-            return os.CPU_COUNT(cpu_set);
+            return usize(os.CPU_COUNT(cpu_set)); // TODO should not need this usize cast
         }
         if (os.windows.is_the_target) {
             var system_info: windows.SYSTEM_INFO = undefined;

std/time.zig+7-17

...	@@ -95,7 +95,7 @@ pub const Timer = struct {	...	@@ -95,7 +95,7 @@ pub const Timer = struct {
95	/// be less precise	95	/// be less precise
96	frequency: switch (builtin.os) {	96	frequency: switch (builtin.os) {
97	.windows => u64,	97	.windows => u64,
98	.macosx, .ios, .tvos, .watchos => darwin.mach_timebase_info_data,	98	.macosx, .ios, .tvos, .watchos => os.darwin.mach_timebase_info_data,
99	else => void,	99	else => void,
100	},	100	},
101	resolution: u64,	101	resolution: u64,
...	@@ -119,20 +119,13 @@ pub const Timer = struct {	...	@@ -119,20 +119,13 @@ pub const Timer = struct {
119	var self: Timer = undefined;	119	var self: Timer = undefined;
120		120
121	if (os.windows.is_the_target) {	121	if (os.windows.is_the_target) {
122	var freq: i64 = undefined;	122	self.frequency = os.windows.QueryPerformanceFrequency();
123	var err = windows.QueryPerformanceFrequency(&freq);
124	if (err == windows.FALSE) return error.TimerUnsupported;
125	self.frequency = @intCast(u64, freq);
126	self.resolution = @divFloor(ns_per_s, self.frequency);	123	self.resolution = @divFloor(ns_per_s, self.frequency);
127		124	self.start_time = os.windows.QueryPerformanceCounter();
128	var start_time: i64 = undefined;
129	err = windows.QueryPerformanceCounter(&start_time);
130	assert(err != windows.FALSE);
131	self.start_time = @intCast(u64, start_time);
132	} else if (os.darwin.is_the_target) {	125	} else if (os.darwin.is_the_target) {
133	darwin.mach_timebase_info(&self.frequency);	126	os.darwin.mach_timebase_info(&self.frequency);
134	self.resolution = @divFloor(self.frequency.numer, self.frequency.denom);	127	self.resolution = @divFloor(self.frequency.numer, self.frequency.denom);
135	self.start_time = darwin.mach_absolute_time();	128	self.start_time = os.darwin.mach_absolute_time();
136	} else {	129	} else {
137	//On Linux, seccomp can do arbitrary things to our ability to call	130	//On Linux, seccomp can do arbitrary things to our ability to call
138	// syscalls, including return any errno value it wants and	131	// syscalls, including return any errno value it wants and
...	@@ -177,13 +170,10 @@ pub const Timer = struct {	...	@@ -177,13 +170,10 @@ pub const Timer = struct {
177		170
178	fn clockNative() u64 {	171	fn clockNative() u64 {
179	if (os.windows.is_the_target) {	172	if (os.windows.is_the_target) {
180	var result: i64 = undefined;	173	return os.windows.QueryPerformanceCounter();
181	var err = windows.QueryPerformanceCounter(&result);
182	assert(err != windows.FALSE);
183	return @intCast(u64, result);
184	}	174	}
185	if (os.darwin.is_the_target) {	175	if (os.darwin.is_the_target) {
186	return darwin.mach_absolute_time();	176	return os.darwin.mach_absolute_time();
187	}	177	}
188	var ts: os.timespec = undefined;	178	var ts: os.timespec = undefined;
189	os.clock_gettime(monotonic_clock_id, &ts) catch unreachable;	179	os.clock_gettime(monotonic_clock_id, &ts) catch unreachable;

test/compare_output.zig+3-3

test/standalone/empty_env/main.zig+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	const std = @import("std");	1	const std = @import("std");
2		2
3	pub fn main() void {	3	pub fn main() void {
4	const env_map = std.os.getEnvMap(std.debug.global_allocator) catch @panic("unable to get env map");	4	const env_map = std.process.getEnvMap(std.debug.global_allocator) catch @panic("unable to get env map");
5	std.testing.expect(env_map.count() == 0);	5	std.testing.expect(env_map.count() == 0);
6	}	6	}

test/tests.zig+1-1

...	@@ -393,7 +393,7 @@ pub const CompareOutputContext = struct {	...	@@ -393,7 +393,7 @@ pub const CompareOutputContext = struct {
393	debug.panic("Unable to spawn {}: {}\n", full_exe_path, @errorName(err));	393	debug.panic("Unable to spawn {}: {}\n", full_exe_path, @errorName(err));
394	};	394	};
395		395
396	const expected_exit_code: i32 = 126;	396	const expected_exit_code: u32 = 126;
397	switch (term) {	397	switch (term) {
398	.Exited => \|code\| {	398	.Exited => \|code\| {
399	if (code != expected_exit_code) {	399	if (code != expected_exit_code) {

author	Andrew Kelley <andrew@ziglang.org> 2019-05-26 23:35:26-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-05-26 23:35:26-04:00
log	0c6ab61b228211398841cf11912c7252362009b7
tree	d2a67490f5e580ba8a447d70edf427e6e0cc6ce0
parent	2b42e910bf4696032158cc7ae268d3c69d699f70
signature	Commit is signed but in an unrecognized format.

...	@@ -182,7 +182,7 @@ pub const LibCInstallation = struct {	...	@@ -182,7 +182,7 @@ pub const LibCInstallation = struct {
182	}	182	}
183		183
184	async fn findNativeIncludeDirLinux(self: LibCInstallation, loop: event.Loop) !void {	184	async fn findNativeIncludeDirLinux(self: LibCInstallation, loop: event.Loop) !void {
185	const cc_exe = std.process.getEnvPosix("CC") orelse "cc";	185	const cc_exe = std.os.getenv("CC") orelse "cc";
186	const argv = []const []const u8{	186	const argv = []const []const u8{
187	cc_exe,	187	cc_exe,
188	"-E",	188	"-E",
...	@@ -392,7 +392,7 @@ pub const LibCInstallation = struct {	...	@@ -392,7 +392,7 @@ pub const LibCInstallation = struct {
392		392
393	/// caller owns returned memory	393	/// caller owns returned memory
394	async fn ccPrintFileName(loop: *event.Loop, o_file: []const u8, want_dirname: bool) ![]u8 {	394	async fn ccPrintFileName(loop: *event.Loop, o_file: []const u8, want_dirname: bool) ![]u8 {
395	const cc_exe = std.process.getEnvPosix("CC") orelse "cc";	395	const cc_exe = std.os.getenv("CC") orelse "cc";
396	const arg1 = try std.fmt.allocPrint(loop.allocator, "-print-file-name={}", o_file);	396	const arg1 = try std.fmt.allocPrint(loop.allocator, "-print-file-name={}", o_file);
397	defer loop.allocator.free(arg1);	397	defer loop.allocator.free(arg1);
398	const argv = []const []const u8{ cc_exe, arg1 };	398	const argv = []const []const u8{ cc_exe, arg1 };
...	@@ -463,7 +463,7 @@ fn fileExists(path: []const u8) !bool {	...	@@ -463,7 +463,7 @@ fn fileExists(path: []const u8) !bool {
463	if (fs.File.access(path)) \|_\| {	463	if (fs.File.access(path)) \|_\| {
464	return true;	464	return true;
465	} else \|err\| switch (err) {	465	} else \|err\| switch (err) {
466	error.FileNotFound, error.PermissionDenied => return false,	466	error.FileNotFound => return false,
467	else => return error.FileSystem,	467	else => return error.FileSystem,
468	}	468	}
469	}	469	}

...	@@ -7,7 +7,7 @@ const DefaultPrng = std.rand.DefaultPrng;	...	@@ -7,7 +7,7 @@ const DefaultPrng = std.rand.DefaultPrng;
7	const expect = std.testing.expect;	7	const expect = std.testing.expect;
8	const expectError = std.testing.expectError;	8	const expectError = std.testing.expectError;
9	const mem = std.mem;	9	const mem = std.mem;
10	const os = std.os;	10	const fs = std.fs;
11	const File = std.fs.File;	11	const File = std.fs.File;
12		12
13	test "write a file, read it, then delete it" {	13	test "write a file, read it, then delete it" {
...	@@ -58,7 +58,7 @@ test "write a file, read it, then delete it" {	...	@@ -58,7 +58,7 @@ test "write a file, read it, then delete it" {
58	expect(mem.eql(u8, contents["begin".len .. contents.len - "end".len], data));	58	expect(mem.eql(u8, contents["begin".len .. contents.len - "end".len], data));
59	expect(mem.eql(u8, contents[contents.len - "end".len ..], "end"));	59	expect(mem.eql(u8, contents[contents.len - "end".len ..], "end"));
60	}	60	}
61	try os.deleteFile(tmp_file_name);	61	try fs.deleteFile(tmp_file_name);
62	}	62	}
63		63
64	test "BufferOutStream" {	64	test "BufferOutStream" {
...	@@ -316,7 +316,7 @@ test "BitStreams with File Stream" {	...	@@ -316,7 +316,7 @@ test "BitStreams with File Stream" {
316		316
317	expectError(error.EndOfStream, bit_stream.readBitsNoEof(u1, 1));	317	expectError(error.EndOfStream, bit_stream.readBitsNoEof(u1, 1));
318	}	318	}
319	try os.deleteFile(tmp_file_name);	319	try fs.deleteFile(tmp_file_name);
320	}	320	}
321		321
322	fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime packing: io.Packing) !void {	322	fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime packing: io.Packing) !void {
...	@@ -596,7 +596,7 @@ test "c out stream" {	...	@@ -596,7 +596,7 @@ test "c out stream" {
596		596
597	const filename = c"tmp_io_test_file.txt";	597	const filename = c"tmp_io_test_file.txt";
598	const out_file = std.c.fopen(filename, c"w") orelse return error.UnableToOpenTestFile;	598	const out_file = std.c.fopen(filename, c"w") orelse return error.UnableToOpenTestFile;
599	defer std.os.deleteFileC(filename) catch {};	599	defer fs.deleteFileC(filename) catch {};
600		600
601	const out_stream = &io.COutStream.init(out_file).stream;	601	const out_stream = &io.COutStream.init(out_file).stream;
602	try out_stream.print("hi: {}\n", i32(123));	602	try out_stream.print("hi: {}\n", i32(123));

...	@@ -377,7 +377,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {	...	@@ -377,7 +377,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
377	\\ stdout.print("before\n") catch unreachable;	377	\\ stdout.print("before\n") catch unreachable;
378	\\ defer stdout.print("defer1\n") catch unreachable;	378	\\ defer stdout.print("defer1\n") catch unreachable;
379	\\ defer stdout.print("defer2\n") catch unreachable;	379	\\ defer stdout.print("defer2\n") catch unreachable;
380	\\ var args_it = @import("std").os.args();	380	\\ var args_it = @import("std").process.args();
381	\\ if (args_it.skip() and !args_it.skip()) return;	381	\\ if (args_it.skip() and !args_it.skip()) return;
382	\\ defer stdout.print("defer3\n") catch unreachable;	382	\\ defer stdout.print("defer3\n") catch unreachable;
383	\\ stdout.print("after\n") catch unreachable;	383	\\ stdout.print("after\n") catch unreachable;
...	@@ -444,7 +444,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {	...	@@ -444,7 +444,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
444	\\const allocator = std.debug.global_allocator;	444	\\const allocator = std.debug.global_allocator;
445	\\	445	\\
446	\\pub fn main() !void {	446	\\pub fn main() !void {
447	\\ var args_it = os.args();	447	\\ var args_it = std.process.args();
448	\\ var stdout_file = try io.getStdOut();	448	\\ var stdout_file = try io.getStdOut();
449	\\ var stdout_adapter = stdout_file.outStream();	449	\\ var stdout_adapter = stdout_file.outStream();
450	\\ const stdout = &stdout_adapter.stream;	450	\\ const stdout = &stdout_adapter.stream;
...	@@ -485,7 +485,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {	...	@@ -485,7 +485,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
485	\\const allocator = std.debug.global_allocator;	485	\\const allocator = std.debug.global_allocator;
486	\\	486	\\
487	\\pub fn main() !void {	487	\\pub fn main() !void {
488	\\ var args_it = os.args();	488	\\ var args_it = std.process.args();
489	\\ var stdout_file = try io.getStdOut();	489	\\ var stdout_file = try io.getStdOut();
490	\\ var stdout_adapter = stdout_file.outStream();	490	\\ var stdout_adapter = stdout_file.outStream();
491	\\ const stdout = &stdout_adapter.stream;	491	\\ const stdout = &stdout_adapter.stream;

tests passing on linux