Commit 62c817420df0420e20756b2c3a4ec99db3b5649d | zig

author	Raul Leal <raulgrell@gmail.com> 2019-12-17 20:43:49+00:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-12-17 15:43:49-05:00
log	62c817420df0420e20756b2c3a4ec99db3b5649d
tree	76c11dd168ae2eced1904a1012eb0a54df279eaa
parent	b242c2ac103cbb251751dcf94f665e57b9551156

[#3844 + #3767] update std.c and std.os.linux to use null-terminated pointer types (#3900)

* #3844 update std.c functions to use null-terminated pointer types

* check linux functions

* fix callsites

* fix io test

* Add allocPrintCstr function to remove other cast

4 files changed, 73 insertions(+), 109 deletions(-)

lib
- std
  - c.zig
  - cstr.zig
  - net.zig
  - os
    linux.zig

lib/std/c.zig+26-28

...	...	@@ -56,9 +56,7 @@ pub fn versionCheck(glibc_version: builtin.Version) type {
56	56	};
57	57	}
58	58
59		// TODO https://github.com/ziglang/zig/issues/265 on this whole file
60
61		pub extern "c" fn fopen(filename: []const u8, modes: []const u8) ?*FILE;
	59	pub extern "c" fn fopen(filename: [:0]const u8, modes: [:0]const u8) ?*FILE;
62	60	pub extern "c" fn fclose(stream: *FILE) c_int;
63	61	pub extern "c" fn fwrite(ptr: []const u8, size_of_type: usize, item_count: usize, stream: FILE) usize;
64	62	pub extern "c" fn fread(ptr: []u8, size_of_type: usize, item_count: usize, stream: FILE) usize;
...	...	@@ -71,8 +69,8 @@ pub extern "c" fn close(fd: fd_t) c_int;
71	69	pub extern "c" fn fstat(fd: fd_t, buf: *Stat) c_int;
72	70	pub extern "c" fn @"fstat$INODE64"(fd: fd_t, buf: *Stat) c_int;
73	71	pub extern "c" fn lseek(fd: fd_t, offset: off_t, whence: c_int) off_t;
74		pub extern "c" fn open(path: [*]const u8, oflag: c_uint, ...) c_int;
75		pub extern "c" fn openat(fd: c_int, path: [*]const u8, oflag: c_uint, ...) c_int;
	72	pub extern "c" fn open(path: [*:0]const u8, oflag: c_uint, ...) c_int;
	73	pub extern "c" fn openat(fd: c_int, path: [*:0]const u8, oflag: c_uint, ...) c_int;
76	74	pub extern "c" fn raise(sig: c_int) c_int;
77	75	pub extern "c" fn read(fd: fd_t, buf: [*]u8, nbyte: usize) isize;
78	76	pub extern "c" fn readv(fd: c_int, iov: [*]const iovec, iovcnt: c_uint) isize;
...	...	@@ -80,40 +78,40 @@ pub extern "c" fn pread(fd: fd_t, buf: [*]u8, nbyte: usize, offset: u64) isize;
80	78	pub extern "c" fn preadv(fd: c_int, iov: [*]const iovec, iovcnt: c_uint, offset: u64) isize;
81	79	pub extern "c" fn writev(fd: c_int, iov: [*]const iovec_const, iovcnt: c_uint) isize;
82	80	pub extern "c" fn pwritev(fd: c_int, iov: [*]const iovec_const, iovcnt: c_uint, offset: u64) isize;
83		pub extern "c" fn stat(noalias path: []const u8, noalias buf: Stat) c_int;
	81	pub extern "c" fn stat(noalias path: [:0]const u8, noalias buf: Stat) c_int;
84	82	pub extern "c" fn write(fd: fd_t, buf: [*]const u8, nbyte: usize) isize;
85	83	pub extern "c" fn pwrite(fd: fd_t, buf: [*]const u8, nbyte: usize, offset: u64) isize;
86	84	pub extern "c" fn mmap(addr: ?align(page_size) c_void, len: usize, prot: c_uint, flags: c_uint, fd: fd_t, offset: u64) c_void;
87	85	pub extern "c" fn munmap(addr: *align(page_size) c_void, len: usize) c_int;
88	86	pub extern "c" fn mprotect(addr: *align(page_size) c_void, len: usize, prot: c_uint) c_int;
89		pub extern "c" fn unlink(path: [*]const u8) c_int;
90		pub extern "c" fn unlinkat(dirfd: fd_t, path: [*]const u8, flags: c_uint) c_int;
	87	pub extern "c" fn unlink(path: [*:0]const u8) c_int;
	88	pub extern "c" fn unlinkat(dirfd: fd_t, path: [*:0]const u8, flags: c_uint) c_int;
91	89	pub extern "c" fn getcwd(buf: []u8, size: usize) ?[]u8;
92	90	pub extern "c" fn waitpid(pid: c_int, stat_loc: *c_uint, options: c_uint) c_int;
93	91	pub extern "c" fn fork() c_int;
94		pub extern "c" fn access(path: [*]const u8, mode: c_uint) c_int;
	92	pub extern "c" fn access(path: [*:0]const u8, mode: c_uint) c_int;
95	93	pub extern "c" fn pipe(fds: *[2]fd_t) c_int;
96	94	pub extern "c" fn pipe2(fds: *[2]fd_t, flags: u32) c_int;
97		pub extern "c" fn mkdir(path: [*]const u8, mode: c_uint) c_int;
98		pub extern "c" fn symlink(existing: []const u8, new: []const u8) c_int;
99		pub extern "c" fn rename(old: []const u8, new: []const u8) c_int;
100		pub extern "c" fn chdir(path: [*]const u8) c_int;
101		pub extern "c" fn execve(path: []const u8, argv: []const ?[]const u8, envp: []const ?[*]const u8) c_int;
	95	pub extern "c" fn mkdir(path: [*:0]const u8, mode: c_uint) c_int;
	96	pub extern "c" fn symlink(existing: [:0]const u8, new: [:0]const u8) c_int;
	97	pub extern "c" fn rename(old: [:0]const u8, new: [:0]const u8) c_int;
	98	pub extern "c" fn chdir(path: [*:0]const u8) c_int;
	99	pub extern "c" fn execve(path: [:0]const u8, argv: [:null]const ?[:0]const u8, envp: [:null]const ?[*:0]const u8) c_int;
102	100	pub extern "c" fn dup(fd: fd_t) c_int;
103	101	pub extern "c" fn dup2(old_fd: fd_t, new_fd: fd_t) c_int;
104		pub extern "c" fn readlink(noalias path: []const u8, noalias buf: []u8, bufsize: usize) isize;
105		pub extern "c" fn realpath(noalias file_name: []const u8, noalias resolved_name: []u8) ?[*:0]u8;
	102	pub extern "c" fn readlink(noalias path: [:0]const u8, noalias buf: []u8, bufsize: usize) isize;
	103	pub extern "c" fn realpath(noalias file_name: [:0]const u8, noalias resolved_name: []u8) ?[*:0]u8;
106	104	pub extern "c" fn sigprocmask(how: c_int, noalias set: const sigset_t, noalias oset: ?sigset_t) c_int;
107	105	pub extern "c" fn gettimeofday(noalias tv: ?timeval, noalias tz: ?timezone) c_int;
108	106	pub extern "c" fn sigaction(sig: c_int, noalias act: const Sigaction, noalias oact: ?Sigaction) c_int;
109	107	pub extern "c" fn nanosleep(rqtp: const timespec, rmtp: ?timespec) c_int;
110	108	pub extern "c" fn setreuid(ruid: c_uint, euid: c_uint) c_int;
111	109	pub extern "c" fn setregid(rgid: c_uint, egid: c_uint) c_int;
112		pub extern "c" fn rmdir(path: [*]const u8) c_int;
	110	pub extern "c" fn rmdir(path: [*:0]const u8) c_int;
113	111	pub extern "c" fn getenv(name: [:0]const u8) ?[:0]u8;
114	112	pub extern "c" fn sysctl(name: []const c_int, namelen: c_uint, oldp: ?c_void, oldlenp: ?usize, newp: ?c_void, newlen: usize) c_int;
115		pub extern "c" fn sysctlbyname(name: []const u8, oldp: ?c_void, oldlenp: ?usize, newp: ?c_void, newlen: usize) c_int;
116		pub extern "c" fn sysctlnametomib(name: []const u8, mibp: ?c_int, sizep: ?*usize) c_int;
	113	pub extern "c" fn sysctlbyname(name: [:0]const u8, oldp: ?c_void, oldlenp: ?usize, newp: ?c_void, newlen: usize) c_int;
	114	pub extern "c" fn sysctlnametomib(name: [:0]const u8, mibp: ?c_int, sizep: ?*usize) c_int;
117	115
118	116	pub extern "c" fn gethostname(name: [*]u8, len: usize) c_int;
119	117	pub extern "c" fn bind(socket: fd_t, address: ?*const sockaddr, address_len: socklen_t) c_int;
...	...	@@ -158,9 +156,9 @@ pub extern "c" fn posix_memalign(memptr: **c_void, alignment: usize, size: usize
158	156
159	157	// Deprecated
160	158	pub extern "c" fn futimes(fd: fd_t, times: *[2]timeval) c_int;
161		pub extern "c" fn utimes(path: []const u8, times: [2]timeval) c_int;
	159	pub extern "c" fn utimes(path: [:0]const u8, times: [2]timeval) c_int;
162	160
163		pub extern "c" fn utimensat(dirfd: fd_t, pathname: []const u8, times: [2]timespec, flags: u32) c_int;
	161	pub extern "c" fn utimensat(dirfd: fd_t, pathname: [:0]const u8, times: [2]timespec, flags: u32) c_int;
164	162	pub extern "c" fn futimens(fd: fd_t, times: *const [2]timespec) c_int;
165	163
166	164	pub extern "c" fn pthread_create(noalias newthread: pthread_t, noalias attr: ?const pthread_attr_t, start_routine: extern fn (?c_void) ?c_void, noalias arg: ?*c_void) c_int;
...	...	@@ -181,8 +179,8 @@ pub extern "c" fn kevent(
181	179	) c_int;
182	180
183	181	pub extern "c" fn getaddrinfo(
184		noalias node: [*]const u8,
185		noalias service: [*]const u8,
	182	noalias node: [*:0]const u8,
	183	noalias service: [*:0]const u8,
186	184	noalias hints: *const addrinfo,
187	185	noalias res: **addrinfo,
188	186	) c_int;
...	...	@@ -199,15 +197,15 @@ pub extern "c" fn getnameinfo(
199	197	flags: u32,
200	198	) c_int;
201	199
202		pub extern "c" fn gai_strerror(errcode: c_int) [*]const u8;
	200	pub extern "c" fn gai_strerror(errcode: c_int) [*:0]const u8;
203	201
204	202	pub extern "c" fn poll(fds: [*]pollfd, nfds: nfds_t, timeout: c_int) c_int;
205	203
206	204	pub extern "c" fn dn_expand(
207		msg: [*]const u8,
208		eomorig: [*]const u8,
209		comp_dn: [*]const u8,
210		exp_dn: [*]u8,
	205	msg: [*:0]const u8,
	206	eomorig: [*:0]const u8,
	207	comp_dn: [*:0]const u8,
	208	exp_dn: [*:0]u8,
211	209	length: c_int,
212	210	) c_int;
213	211

lib/std/cstr.zig+4-4

...	...	@@ -9,7 +9,7 @@ pub const line_sep = switch (builtin.os) {
9	9	else => "\n",
10	10	};
11	11
12		pub fn cmp(a: []const u8, b: []const u8) i8 {
	12	pub fn cmp(a: [:0]const u8, b: [:0]const u8) i8 {
13	13	var index: usize = 0;
14	14	while (a[index] == b[index] and a[index] != 0) : (index += 1) {}
15	15	if (a[index] > b[index]) {
...	...	@@ -33,7 +33,7 @@ fn testCStrFnsImpl() void {
33	33
34	34	/// Returns a mutable slice with 1 more byte of length which is a null byte.
35	35	/// Caller owns the returned memory.
36		pub fn addNullByte(allocator: *mem.Allocator, slice: []const u8) ![]u8 {
	36	pub fn addNullByte(allocator: *mem.Allocator, slice: []const u8) ![:0]u8 {
37	37	const result = try allocator.alloc(u8, slice.len + 1);
38	38	mem.copy(u8, result, slice);
39	39	result[slice.len] = 0;
...	...	@@ -43,7 +43,7 @@ pub fn addNullByte(allocator: *mem.Allocator, slice: []const u8) ![]u8 {
43	43	pub const NullTerminated2DArray = struct {
44	44	allocator: *mem.Allocator,
45	45	byte_count: usize,
46		ptr: ?[]?[]u8,
	46	ptr: ?[:null]?[:0]u8,
47	47
48	48	/// Takes N lists of strings, concatenates the lists together, and adds a null terminator
49	49	/// Caller must deinit result
...	...	@@ -83,7 +83,7 @@ pub const NullTerminated2DArray = struct {
83	83	return NullTerminated2DArray{
84	84	.allocator = allocator,
85	85	.byte_count = byte_count,
86		.ptr = @ptrCast(?[]?[]u8, buf.ptr),
	86	.ptr = @ptrCast(?[:null]?[:0]u8, buf.ptr),
87	87	};
88	88	}
89	89

lib/std/net.zig+5-1

...	...	@@ -451,7 +451,11 @@ pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !
451	451	.next = null,
452	452	};
453	453	var res: *os.addrinfo = undefined;
454		switch (os.system.getaddrinfo(name_c.ptr, port_c.ptr, &hints, &res)) {
	454	switch (os.system.getaddrinfo(
	455	name_c.ptr,
	456	@ptrCast([*:0]const u8, port_c.ptr),
	457	&hints,
	458	&res)) {
455	459	0 => {},
456	460	c.EAI_ADDRFAMILY => return error.HostLacksNetworkAddresses,
457	461	c.EAI_AGAIN => return error.TemporaryNameServerFailure,

lib/std/os/linux.zig+38-76

...	...	@@ -65,18 +65,15 @@ pub fn dup3(old: i32, new: i32, flags: u32) usize {
65	65	return syscall3(SYS_dup3, @bitCast(usize, @as(isize, old)), @bitCast(usize, @as(isize, new)), flags);
66	66	}
67	67
68		// TODO https://github.com/ziglang/zig/issues/265
69		pub fn chdir(path: [*]const u8) usize {
	68	pub fn chdir(path: [*:0]const u8) usize {
70	69	return syscall1(SYS_chdir, @ptrToInt(path));
71	70	}
72	71
73		// TODO https://github.com/ziglang/zig/issues/265
74		pub fn chroot(path: [*]const u8) usize {
	72	pub fn chroot(path: [*:0]const u8) usize {
75	73	return syscall1(SYS_chroot, @ptrToInt(path));
76	74	}
77	75
78		// TODO https://github.com/ziglang/zig/issues/265
79		pub fn execve(path: []const u8, argv: []const ?[]const u8, envp: []const ?[*]const u8) usize {
	76	pub fn execve(path: [:0]const u8, argv: [:null]const ?[:0]const u8, envp: [:null]const ?[*:0]const u8) usize {
80	77	return syscall3(SYS_execve, @ptrToInt(path), @ptrToInt(argv), @ptrToInt(envp));
81	78	}
82	79
...	...	@@ -101,8 +98,7 @@ pub fn futimens(fd: i32, times: *const [2]timespec) usize {
101	98	return utimensat(fd, null, times, 0);
102	99	}
103	100
104		// TODO https://github.com/ziglang/zig/issues/265
105		pub fn utimensat(dirfd: i32, path: ?[]const u8, times: const [2]timespec, flags: u32) usize {
	101	pub fn utimensat(dirfd: i32, path: ?[:0]const u8, times: const [2]timespec, flags: u32) usize {
106	102	return syscall4(SYS_utimensat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), @ptrToInt(times), flags);
107	103	}
108	104
...	...	@@ -140,7 +136,7 @@ pub fn inotify_init1(flags: u32) usize {
140	136	return syscall1(SYS_inotify_init1, flags);
141	137	}
142	138
143		pub fn inotify_add_watch(fd: i32, pathname: [*]const u8, mask: u32) usize {
	139	pub fn inotify_add_watch(fd: i32, pathname: [*:0]const u8, mask: u32) usize {
144	140	return syscall3(SYS_inotify_add_watch, @bitCast(usize, @as(isize, fd)), @ptrToInt(pathname), mask);
145	141	}
146	142
...	...	@@ -148,8 +144,7 @@ pub fn inotify_rm_watch(fd: i32, wd: i32) usize {
148	144	return syscall2(SYS_inotify_rm_watch, @bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, wd)));
149	145	}
150	146
151		// TODO https://github.com/ziglang/zig/issues/265
152		pub fn readlink(noalias path: []const u8, noalias buf_ptr: []u8, buf_len: usize) usize {
	147	pub fn readlink(noalias path: [:0]const u8, noalias buf_ptr: []u8, buf_len: usize) usize {
153	148	if (@hasDecl(@This(), "SYS_readlink")) {
154	149	return syscall3(SYS_readlink, @ptrToInt(path), @ptrToInt(buf_ptr), buf_len);
155	150	} else {
...	...	@@ -157,13 +152,11 @@ pub fn readlink(noalias path: []const u8, noalias buf_ptr: []u8, buf_len: usiz
157	152	}
158	153	}
159	154
160		// TODO https://github.com/ziglang/zig/issues/265
161		pub fn readlinkat(dirfd: i32, noalias path: []const u8, noalias buf_ptr: []u8, buf_len: usize) usize {
	155	pub fn readlinkat(dirfd: i32, noalias path: [:0]const u8, noalias buf_ptr: []u8, buf_len: usize) usize {
162	156	return syscall4(SYS_readlinkat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), @ptrToInt(buf_ptr), buf_len);
163	157	}
164	158
165		// TODO https://github.com/ziglang/zig/issues/265
166		pub fn mkdir(path: [*]const u8, mode: u32) usize {
	159	pub fn mkdir(path: [*:0]const u8, mode: u32) usize {
167	160	if (@hasDecl(@This(), "SYS_mkdir")) {
168	161	return syscall2(SYS_mkdir, @ptrToInt(path), mode);
169	162	} else {
...	...	@@ -171,23 +164,19 @@ pub fn mkdir(path: [*]const u8, mode: u32) usize {
171	164	}
172	165	}
173	166
174		// TODO https://github.com/ziglang/zig/issues/265
175		pub fn mkdirat(dirfd: i32, path: [*]const u8, mode: u32) usize {
	167	pub fn mkdirat(dirfd: i32, path: [*:0]const u8, mode: u32) usize {
176	168	return syscall3(SYS_mkdirat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), mode);
177	169	}
178	170
179		// TODO https://github.com/ziglang/zig/issues/265
180		pub fn mount(special: []const u8, dir: []const u8, fstype: [*]const u8, flags: u32, data: usize) usize {
	171	pub fn mount(special: [:0]const u8, dir: [:0]const u8, fstype: [*:0]const u8, flags: u32, data: usize) usize {
181	172	return syscall5(SYS_mount, @ptrToInt(special), @ptrToInt(dir), @ptrToInt(fstype), flags, data);
182	173	}
183	174
184		// TODO https://github.com/ziglang/zig/issues/265
185		pub fn umount(special: [*]const u8) usize {
	175	pub fn umount(special: [*:0]const u8) usize {
186	176	return syscall2(SYS_umount2, @ptrToInt(special), 0);
187	177	}
188	178
189		// TODO https://github.com/ziglang/zig/issues/265
190		pub fn umount2(special: [*]const u8, flags: u32) usize {
	179	pub fn umount2(special: [*:0]const u8, flags: u32) usize {
191	180	return syscall2(SYS_umount2, @ptrToInt(special), flags);
192	181	}
193	182
...	...	@@ -307,8 +296,7 @@ pub fn pwritev2(fd: i32, iov: [*]const iovec_const, count: usize, offset: u64, f
307	296	);
308	297	}
309	298
310		// TODO https://github.com/ziglang/zig/issues/265
311		pub fn rmdir(path: [*]const u8) usize {
	299	pub fn rmdir(path: [*:0]const u8) usize {
312	300	if (@hasDecl(@This(), "SYS_rmdir")) {
313	301	return syscall1(SYS_rmdir, @ptrToInt(path));
314	302	} else {
...	...	@@ -316,8 +304,7 @@ pub fn rmdir(path: [*]const u8) usize {
316	304	}
317	305	}
318	306
319		// TODO https://github.com/ziglang/zig/issues/265
320		pub fn symlink(existing: []const u8, new: []const u8) usize {
	307	pub fn symlink(existing: [:0]const u8, new: [:0]const u8) usize {
321	308	if (@hasDecl(@This(), "SYS_symlink")) {
322	309	return syscall2(SYS_symlink, @ptrToInt(existing), @ptrToInt(new));
323	310	} else {
...	...	@@ -325,18 +312,15 @@ pub fn symlink(existing: []const u8, new: []const u8) usize {
325	312	}
326	313	}
327	314
328		// TODO https://github.com/ziglang/zig/issues/265
329		pub fn symlinkat(existing: []const u8, newfd: i32, newpath: []const u8) usize {
	315	pub fn symlinkat(existing: [:0]const u8, newfd: i32, newpath: [:0]const u8) usize {
330	316	return syscall3(SYS_symlinkat, @ptrToInt(existing), @bitCast(usize, @as(isize, newfd)), @ptrToInt(newpath));
331	317	}
332	318
333		// TODO https://github.com/ziglang/zig/issues/265
334	319	pub fn pread(fd: i32, buf: [*]u8, count: usize, offset: usize) usize {
335	320	return syscall4(SYS_pread, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), count, offset);
336	321	}
337	322
338		// TODO https://github.com/ziglang/zig/issues/265
339		pub fn access(path: [*]const u8, mode: u32) usize {
	323	pub fn access(path: [*:0]const u8, mode: u32) usize {
340	324	if (@hasDecl(@This(), "SYS_access")) {
341	325	return syscall2(SYS_access, @ptrToInt(path), mode);
342	326	} else {
...	...	@@ -344,8 +328,7 @@ pub fn access(path: [*]const u8, mode: u32) usize {
344	328	}
345	329	}
346	330
347		// TODO https://github.com/ziglang/zig/issues/265
348		pub fn faccessat(dirfd: i32, path: [*]const u8, mode: u32, flags: u32) usize {
	331	pub fn faccessat(dirfd: i32, path: [*:0]const u8, mode: u32, flags: u32) usize {
349	332	return syscall4(SYS_faccessat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), mode, flags);
350	333	}
351	334
...	...	@@ -371,8 +354,7 @@ pub fn pwrite(fd: i32, buf: [*]const u8, count: usize, offset: usize) usize {
371	354	return syscall4(SYS_pwrite, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), count, offset);
372	355	}
373	356
374		// TODO https://github.com/ziglang/zig/issues/265
375		pub fn rename(old: []const u8, new: []const u8) usize {
	357	pub fn rename(old: [:0]const u8, new: [:0]const u8) usize {
376	358	if (@hasDecl(@This(), "SYS_rename")) {
377	359	return syscall2(SYS_rename, @ptrToInt(old), @ptrToInt(new));
378	360	} else if (@hasDecl(@This(), "SYS_renameat")) {
...	...	@@ -403,8 +385,7 @@ pub fn renameat(oldfd: i32, oldpath: []const u8, newfd: i32, newpath: []const
403	385	}
404	386	}
405	387
406		// TODO https://github.com/ziglang/zig/issues/265
407		pub fn renameat2(oldfd: i32, oldpath: []const u8, newfd: i32, newpath: []const u8, flags: u32) usize {
	388	pub fn renameat2(oldfd: i32, oldpath: [:0]const u8, newfd: i32, newpath: [:0]const u8, flags: u32) usize {
408	389	return syscall5(
409	390	SYS_renameat2,
410	391	@bitCast(usize, @as(isize, oldfd)),
...	...	@@ -415,8 +396,7 @@ pub fn renameat2(oldfd: i32, oldpath: []const u8, newfd: i32, newpath: []const
415	396	);
416	397	}
417	398
418		// TODO https://github.com/ziglang/zig/issues/265
419		pub fn open(path: [*]const u8, flags: u32, perm: usize) usize {
	399	pub fn open(path: [*:0]const u8, flags: u32, perm: usize) usize {
420	400	if (@hasDecl(@This(), "SYS_open")) {
421	401	return syscall3(SYS_open, @ptrToInt(path), flags, perm);
422	402	} else {
...	...	@@ -430,13 +410,11 @@ pub fn open(path: [*]const u8, flags: u32, perm: usize) usize {
430	410	}
431	411	}
432	412
433		// TODO https://github.com/ziglang/zig/issues/265
434		pub fn create(path: [*]const u8, perm: usize) usize {
	413	pub fn create(path: [*:0]const u8, perm: usize) usize {
435	414	return syscall2(SYS_creat, @ptrToInt(path), perm);
436	415	}
437	416
438		// TODO https://github.com/ziglang/zig/issues/265
439		pub fn openat(dirfd: i32, path: [*]const u8, flags: u32, mode: usize) usize {
	417	pub fn openat(dirfd: i32, path: [*:0]const u8, flags: u32, mode: usize) usize {
440	418	// dirfd could be negative, for example AT_FDCWD is -100
441	419	return syscall4(SYS_openat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), flags, mode);
442	420	}
...	...	@@ -490,8 +468,7 @@ pub fn kill(pid: i32, sig: i32) usize {
490	468	return syscall2(SYS_kill, @bitCast(usize, @as(isize, pid)), @bitCast(usize, @as(isize, sig)));
491	469	}
492	470
493		// TODO https://github.com/ziglang/zig/issues/265
494		pub fn unlink(path: [*]const u8) usize {
	471	pub fn unlink(path: [*:0]const u8) usize {
495	472	if (@hasDecl(@This(), "SYS_unlink")) {
496	473	return syscall1(SYS_unlink, @ptrToInt(path));
497	474	} else {
...	...	@@ -499,8 +476,7 @@ pub fn unlink(path: [*]const u8) usize {
499	476	}
500	477	}
501	478
502		// TODO https://github.com/ziglang/zig/issues/265
503		pub fn unlinkat(dirfd: i32, path: [*]const u8, flags: u32) usize {
	479	pub fn unlinkat(dirfd: i32, path: [*:0]const u8, flags: u32) usize {
504	480	return syscall3(SYS_unlinkat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), flags);
505	481	}
506	482
...	...	@@ -903,8 +879,7 @@ pub fn fstat(fd: i32, stat_buf: *Stat) usize {
903	879	}
904	880	}
905	881
906		// TODO https://github.com/ziglang/zig/issues/265
907		pub fn stat(pathname: []const u8, statbuf: Stat) usize {
	882	pub fn stat(pathname: [:0]const u8, statbuf: Stat) usize {
908	883	if (@hasDecl(@This(), "SYS_stat64")) {
909	884	return syscall2(SYS_stat64, @ptrToInt(pathname), @ptrToInt(statbuf));
910	885	} else {
...	...	@@ -912,8 +887,7 @@ pub fn stat(pathname: []const u8, statbuf: Stat) usize {
912	887	}
913	888	}
914	889
915		// TODO https://github.com/ziglang/zig/issues/265
916		pub fn lstat(pathname: []const u8, statbuf: Stat) usize {
	890	pub fn lstat(pathname: [:0]const u8, statbuf: Stat) usize {
917	891	if (@hasDecl(@This(), "SYS_lstat64")) {
918	892	return syscall2(SYS_lstat64, @ptrToInt(pathname), @ptrToInt(statbuf));
919	893	} else {
...	...	@@ -921,8 +895,7 @@ pub fn lstat(pathname: []const u8, statbuf: Stat) usize {
921	895	}
922	896	}
923	897
924		// TODO https://github.com/ziglang/zig/issues/265
925		pub fn fstatat(dirfd: i32, path: []const u8, stat_buf: Stat, flags: u32) usize {
	898	pub fn fstatat(dirfd: i32, path: [:0]const u8, stat_buf: Stat, flags: u32) usize {
926	899	if (@hasDecl(@This(), "SYS_fstatat64")) {
927	900	return syscall4(SYS_fstatat64, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), @ptrToInt(stat_buf), flags);
928	901	} else {
...	...	@@ -944,13 +917,11 @@ pub fn statx(dirfd: i32, path: []const u8, flags: u32, mask: u32, statx_buf: S
944	917	return @bitCast(usize, @as(isize, -ENOSYS));
945	918	}
946	919
947		// TODO https://github.com/ziglang/zig/issues/265
948		pub fn listxattr(path: []const u8, list: []u8, size: usize) usize {
	920	pub fn listxattr(path: [:0]const u8, list: []u8, size: usize) usize {
949	921	return syscall3(SYS_listxattr, @ptrToInt(path), @ptrToInt(list), size);
950	922	}
951	923
952		// TODO https://github.com/ziglang/zig/issues/265
953		pub fn llistxattr(path: []const u8, list: []u8, size: usize) usize {
	924	pub fn llistxattr(path: [:0]const u8, list: []u8, size: usize) usize {
954	925	return syscall3(SYS_llistxattr, @ptrToInt(path), @ptrToInt(list), size);
955	926	}
956	927
...	...	@@ -958,48 +929,39 @@ pub fn flistxattr(fd: usize, list: [*]u8, size: usize) usize {
958	929	return syscall3(SYS_flistxattr, fd, @ptrToInt(list), size);
959	930	}
960	931
961		// TODO https://github.com/ziglang/zig/issues/265
962		pub fn getxattr(path: []const u8, name: []const u8, value: [*]u8, size: usize) usize {
	932	pub fn getxattr(path: [:0]const u8, name: [:0]const u8, value: [*]u8, size: usize) usize {
963	933	return syscall4(SYS_getxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size);
964	934	}
965	935
966		// TODO https://github.com/ziglang/zig/issues/265
967		pub fn lgetxattr(path: []const u8, name: []const u8, value: [*]u8, size: usize) usize {
	936	pub fn lgetxattr(path: [:0]const u8, name: [:0]const u8, value: [*]u8, size: usize) usize {
968	937	return syscall4(SYS_lgetxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size);
969	938	}
970	939
971		// TODO https://github.com/ziglang/zig/issues/265
972		pub fn fgetxattr(fd: usize, name: []const u8, value: []u8, size: usize) usize {
	940	pub fn fgetxattr(fd: usize, name: [:0]const u8, value: []u8, size: usize) usize {
973	941	return syscall4(SYS_lgetxattr, fd, @ptrToInt(name), @ptrToInt(value), size);
974	942	}
975	943
976		// TODO https://github.com/ziglang/zig/issues/265
977		pub fn setxattr(path: []const u8, name: []const u8, value: *const void, size: usize, flags: usize) usize {
	944	pub fn setxattr(path: [:0]const u8, name: [:0]const u8, value: *const void, size: usize, flags: usize) usize {
978	945	return syscall5(SYS_setxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size, flags);
979	946	}
980	947
981		// TODO https://github.com/ziglang/zig/issues/265
982		pub fn lsetxattr(path: []const u8, name: []const u8, value: *const void, size: usize, flags: usize) usize {
	948	pub fn lsetxattr(path: [:0]const u8, name: [:0]const u8, value: *const void, size: usize, flags: usize) usize {
983	949	return syscall5(SYS_lsetxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size, flags);
984	950	}
985	951
986		// TODO https://github.com/ziglang/zig/issues/265
987		pub fn fsetxattr(fd: usize, name: []const u8, value: const void, size: usize, flags: usize) usize {
	952	pub fn fsetxattr(fd: usize, name: [:0]const u8, value: const void, size: usize, flags: usize) usize {
988	953	return syscall5(SYS_fsetxattr, fd, @ptrToInt(name), @ptrToInt(value), size, flags);
989	954	}
990	955
991		// TODO https://github.com/ziglang/zig/issues/265
992		pub fn removexattr(path: []const u8, name: []const u8) usize {
	956	pub fn removexattr(path: [:0]const u8, name: [:0]const u8) usize {
993	957	return syscall2(SYS_removexattr, @ptrToInt(path), @ptrToInt(name));
994	958	}
995	959
996		// TODO https://github.com/ziglang/zig/issues/265
997		pub fn lremovexattr(path: []const u8, name: []const u8) usize {
	960	pub fn lremovexattr(path: [:0]const u8, name: [:0]const u8) usize {
998	961	return syscall2(SYS_lremovexattr, @ptrToInt(path), @ptrToInt(name));
999	962	}
1000	963
1001		// TODO https://github.com/ziglang/zig/issues/265
1002		pub fn fremovexattr(fd: usize, name: [*]const u8) usize {
	964	pub fn fremovexattr(fd: usize, name: [*:0]const u8) usize {
1003	965	return syscall2(SYS_fremovexattr, fd, @ptrToInt(name));
1004	966	}
1005	967