diff options
Diffstat (limited to 'src/ninep/ctl.zig')
| -rw-r--r-- | src/ninep/ctl.zig | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig index 53753b42..de4166cd 100644 --- a/src/ninep/ctl.zig +++ b/src/ninep/ctl.zig @@ -122,10 +122,6 @@ const Messages = struct { /// a diff's context line ` ` alone): only its `\r` goes. keep_blanks: bool = false, - fn init(p: *Pardes, data: []const u8) Messages { - return .{ .p = p, .data = data }; - } - fn next(m: *Messages) ?[]const u8 { if (m.at >= m.data.len) return null; const start = m.at; @@ -198,7 +194,7 @@ pub fn command(p: *Pardes, req: Req, serial: ?u32, exec: bool, in_tag: bool) Rep if (editNotAlone(p, req.data)) return tree.failText(req.tag, E.INVAL, e_after_edit); for ([2]bool{ false, true }) |apply| { if (apply) p.fs.results_len = 0; - var it = Messages.init(p, req.data); + var it: Messages = .{ .p = p, .data = req.data }; it.keep_blanks = !exec; while (it.next()) |text| { if (text.len == 0) continue; @@ -273,7 +269,7 @@ fn editNotAlone(p: *Pardes, data: []const u8) bool { const sam = @import("../sam_edit.zig"); var lines: usize = 0; var runs = false; - var it = Messages.init(p, data); + var it: Messages = .{ .p = p, .data = data }; while (it.next()) |line| { if (line.len == 0 or exec_line.isComment(line)) continue; lines += 1; @@ -651,7 +647,7 @@ pub fn settingsText(p: *Pardes) ![]const u8 { pub fn writePager(p: *Pardes, req: Req) Reply { // A refused write leaves its open no answer, not the last one's. p.fs.results_len = 0; - var it = Messages.init(p, req.data); + var it: Messages = .{ .p = p, .data = req.data }; const line = it.next() orelse ""; // Words 9ns maps back to EINVAL (`invalid`), as every refusal here. One // directory an open, as pty/run takes one line: through a mount @@ -669,15 +665,17 @@ pub fn writePager(p: *Pardes, req: Req) Reply { var shown: [256]u8 = undefined; return tree.failText(req.tag, E.INVAL, std.fmt.bufPrint(&p.fs.ename, "pager: invalid directory \"{s}\": must be absolute", .{blanked(dir[0..@min(dir.len, shown.len)], &shown)}) catch "pager: invalid directory: must be absolute"); } - if (comptime pardes.hosted) if (dir.len > 0) if (pardes.filesystem.localPath(dir)) |local| if (exec_line.kindOf(local) != .directory) { + if (comptime pardes.hosted) if (dir.len > 0) if (pardes.filesystem.localPath(dir)) |local| { // A file there is no directory, ENOTDIR; nothing there, ENOENT. - if (exec_line.kindOf(local) != null) - return tree.failText(req.tag, E.NOTDIR, std.fmt.bufPrint(&p.fs.ename, "pager: {s}: not a directory", .{dir[0..@min(dir.len, 256)]}) catch "pager: not a directory"); - return tree.failText(req.tag, E.NOENT, std.fmt.bufPrint(&p.fs.ename, "pager: {s}: no such directory", .{dir[0..@min(dir.len, 256)]}) catch "pager: no such directory"); + if (exec_line.kindOf(local) != .directory) { + if (exec_line.kindOf(local) != null) + return tree.failText(req.tag, E.NOTDIR, std.fmt.bufPrint(&p.fs.ename, "pager: {s}: not a directory", .{dir[0..@min(dir.len, 256)]}) catch "pager: not a directory"); + return tree.failText(req.tag, E.NOENT, std.fmt.bufPrint(&p.fs.ename, "pager: {s}: no such directory", .{dir[0..@min(dir.len, 256)]}) catch "pager: no such directory"); + } + // Nor one that may not be written, as a file's name there is refused. + if (pardes.filesystem.deniedAbove(local)) + return tree.failText(req.tag, E.PERM, std.fmt.bufPrint(&p.fs.ename, "pager: {s}: permission denied", .{dir[0..@min(dir.len, 256)]}) catch "pager: permission denied"); }; - // Nor one that may not be written, as a file's name there is refused. - if (comptime pardes.hosted) if (dir.len > 0) if (pardes.filesystem.localPath(dir)) |local| if (pardes.filesystem.deniedAbove(local)) - return tree.failText(req.tag, E.PERM, std.fmt.bufPrint(&p.fs.ename, "pager: {s}: permission denied", .{dir[0..@min(dir.len, 256)]}) catch "pager: permission denied"); const id = pardes.panes.Output.openPager(p, p.active, dir) catch |err| return tree.failText(req.tag, if (err == error.NoPaneRoom or err == error.NoPaneSlots) E.NOSPC else E.IO, switch (err) { error.NoPaneRoom, error.NoPaneSlots => "pager: no space for a +Pager pane", @@ -732,7 +730,7 @@ pub fn fillClosedPagers(p: *Pardes) void { pub fn writeRoot(p: *Pardes, req: Req) Reply { for ([2]bool{ false, true }) |apply| { if (apply) p.fs.results_len = 0; - var it = Messages.init(p, req.data); + var it: Messages = .{ .p = p, .data = req.data }; while (it.next()) |line| { if (line.len == 0 or exec_line.isComment(line)) continue; if (std.mem.startsWith(u8, line, "size ") or std.mem.eql(u8, line, "size")) { @@ -1061,7 +1059,7 @@ pub fn writePane(p: *Pardes, req: Req, pane: *Pane) Reply { for ([2]bool{ false, true }) |apply| { if (apply) p.fs.results_len = 0; var held = !other and pane.fs.lock != null; - var it = Messages.init(p, req.data); + var it: Messages = .{ .p = p, .data = req.data }; while (it.next()) |line_in| { if (line_in.len == 0 or exec_line.isComment(line_in)) continue; // A line before this one may have closed the pane (`Del`). |
