authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2025-12-17 18:17:04 -08:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2025-12-17 18:17:04 -08:00
log9a4f8159be199f9a94d96a9cb41f4a88c592b46f
treec093c2570990a1497f0653e162ddfdd2a3301754
parent874ae5c71c029969d4aef1aaea77b6dcbf913289

zig-sys rework

5 files changed, 36 insertions(+), 23 deletions(-)

Dir.zig+10-4
......@@ -1,19 +1,24 @@
11const std = @import("std");
2const sys_libc = @import("sys-libc");
2const builtin = @import("builtin");
3const sys_linux = @import("sys-linux");
34
45const nfs = @import("./nfs.zig");
56const File = nfs.File;
67const Dir = @This();
78
9const os = builtin.target.os.tag;
10
811fd: nfs.Handle,
912
1013pub fn close(self: Dir) void {
11 sys_libc.close(@intFromEnum(self.fd)) catch {};
14 if (os == .linux)
15 sys_linux.close(@intFromEnum(self.fd)) catch {};
1216}
1317
1418pub fn openFile(self: Dir, sub_path: [:0]const u8, flags: OpenFileFlags) !File {
1519 _ = flags;
16 return .{ .fd = @enumFromInt(try sys_libc.openat(@intFromEnum(self.fd), sub_path.ptr, sys_libc.O.RDONLY)) };
20 if (os == .linux)
21 return .{ .fd = @enumFromInt(try sys_linux.openat(@intFromEnum(self.fd), sub_path.ptr, sys_linux.O.RDONLY)) };
1722}
1823
1924pub const OpenFileFlags = packed struct {
......@@ -22,7 +27,8 @@ pub const OpenFileFlags = packed struct {
2227
2328pub fn openDir(self: Dir, sub_path: [:0]const u8, flags: OpenDirFlags) !Dir {
2429 _ = flags;
25 return .{ .fd = @enumFromInt(try sys_libc.openat(@intFromEnum(self.fd), sub_path.ptr, sys_libc.O.RDONLY | sys_libc.O.DIRECTORY)) };
30 if (os == .linux)
31 return .{ .fd = @enumFromInt(try sys_linux.openat(@intFromEnum(self.fd), sub_path.ptr, sys_linux.O.RDONLY | sys_linux.O.DIRECTORY)) };
2632}
2733
2834pub const OpenDirFlags = packed struct {
File.zig+12-8
......@@ -1,28 +1,31 @@
11const std = @import("std");
22const builtin = @import("builtin");
3const sys_libc = @import("sys-libc");
3const sys_linux = @import("sys-linux");
44const nio = @import("nio");
5const errno = @import("errno");
65const time = @import("time");
76
87const nfs = @import("./nfs.zig");
98const Dir = nfs.Dir;
109const File = @This();
1110
11const os = builtin.target.os.tag;
12
1213fd: nfs.Handle,
1314
1415pub fn close(self: File) void {
15 sys_libc.close(@intFromEnum(self.fd)) catch {};
16 if (os == .linux)
17 sys_linux.close(@intFromEnum(self.fd)) catch {};
1618}
1719
1820pub const ReadError = switch (builtin.target.os.tag) {
1921 .linux,
20 => errno.Error,
22 => sys_linux.errno.Error,
2123 else => @compileError("TODO"),
2224};
2325pub usingnamespace nio.Readable(@This(), ._bare);
2426pub fn read(self: File, buffer: []u8) ReadError!usize {
25 return sys_libc.read(@intFromEnum(self.fd), buffer);
27 if (os == .linux)
28 return sys_linux.read(@intFromEnum(self.fd), buffer);
2629}
2730
2831pub fn anyReadable(self: File) nio.AnyReadable {
......@@ -42,7 +45,8 @@ pub fn anyReadable(self: File) nio.AnyReadable {
4245}
4346
4447pub fn stat(self: File) !Stat {
45 const st = try sys_libc.fstat(@intFromEnum(self.fd));
48 if (os != .linux) @compileError("TODO: File.stat");
49 const st = try sys_linux.fstat(@intFromEnum(self.fd));
4650 return .{
4751 .inode = st.ino,
4852 .size = @bitCast(st.size),
......@@ -106,13 +110,13 @@ pub const Stat = struct {
106110
107111pub const INode = switch (builtin.target.os.tag) {
108112 .linux,
109 => sys_libc.ino_t,
113 => sys_linux.ino_t,
110114 else => |v| @compileError("TODO: " ++ @tagName(v)),
111115};
112116
113117pub const Mode = switch (builtin.target.os.tag) {
114118 .linux,
115 => sys_libc.mode_t,
119 => sys_linux.mode_t,
116120 else => |v| @compileError("TODO: " ++ @tagName(v)),
117121};
118122
licenses.txt+1-3
......@@ -5,9 +5,7 @@ MPL-2.0:
55
66MIT:
77= https://spdx.org/licenses/MIT
8- git https://github.com/nektro/zig-errno
9- git https://github.com/nektro/zig-libc
10- git https://github.com/nektro/zig-sys-libc
8- git https://github.com/nektro/zig-sys-linux
119- git https://github.com/nektro/zig-time
1210
1311Unspecified:
nfs.zig+12-6
......@@ -1,28 +1,34 @@
11const std = @import("std");
22const builtin = @import("builtin");
3const sys_libc = @import("sys-libc");
3const sys_linux = @import("sys-linux");
44
55pub const Dir = @import("./Dir.zig");
66pub const File = @import("./File.zig");
77
8pub const Handle = switch (builtin.target.os.tag) {
8const os = builtin.target.os.tag;
9
10pub const Handle = switch (os) {
911 .linux,
1012 => enum(c_int) { _ },
1113 else => @compileError("TODO"),
1214};
1315
1416pub fn cwd() Dir {
15 return .{ .fd = @enumFromInt(sys_libc.AT.FDCWD) };
17 if (os == .linux)
18 return .{ .fd = @enumFromInt(sys_linux.AT.FDCWD) };
1619}
1720
1821pub fn stdin() File {
19 return .{ .fd = @enumFromInt(0) };
22 if (os == .linux)
23 return .{ .fd = @enumFromInt(0) };
2024}
2125
2226pub fn stdout() File {
23 return .{ .fd = @enumFromInt(1) };
27 if (os == .linux)
28 return .{ .fd = @enumFromInt(1) };
2429}
2530
2631pub fn stderr() File {
27 return .{ .fd = @enumFromInt(2) };
32 if (os == .linux)
33 return .{ .fd = @enumFromInt(2) };
2834}
zigmod.yml+1-2
......@@ -6,7 +6,6 @@ description: Nektro's Filesystem, an alternative to std.fs
66min_zig_version: 0.14.0
77min_zigmod_version: r96
88dependencies:
9 - src: git https://github.com/nektro/zig-sys-libc
9 - src: git https://github.com/nektro/zig-sys-linux
1010 - src: git https://github.com/nektro/zig-nio
11 - src: git https://github.com/nektro/zig-errno
1211 - src: git https://github.com/nektro/zig-time