diff options
Diffstat (limited to 'src/ninep/tree.zig')
| -rw-r--r-- | src/ninep/tree.zig | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/ninep/tree.zig b/src/ninep/tree.zig index 707ce40a..3b8a8581 100644 --- a/src/ninep/tree.zig +++ b/src/ninep/tree.zig @@ -1258,8 +1258,17 @@ pub fn holdsPage(p: *Pardes, req: Req) bool { fn writeLines(p: *Pardes, req: Req, target: Target) Reply { // A command line holds no control character but a tab: the whole write - // is refused at once, not held to fail unseen at the close. - if (resultsFile(target) or ctlFile(target)) for (req.data) |c| if ((c < ' ' and c != '\t' and c != '\n' and c != '\r') or c == 0x7f) return failText(req.tag, E.INVAL, ctl.e_control); + // is refused at once, not held to fail unseen at the close, and the + // line it is in goes with it, as one refused for its length does: the + // start a write before held, and the rest, through its newline, that + // the next write brings. + if (resultsFile(target) or ctlFile(target)) for (req.data) |c| if ((c < ' ' and c != '\t' and c != '\n' and c != '\r') or c == 0x7f) { + if (openOf(p, req)) |o| if (o.what == .lines or o.what == .ctl) { + o.pending.clearRetainingCapacity(); + o.discarding = !std.mem.endsWith(u8, req.data, "\n"); + }; + return failText(req.tag, E.INVAL, ctl.e_control); + }; // A NUL no name may hold fails its write at once, not the close. if (target == .pane and target.pane.file == .name and std.mem.indexOfScalar(u8, req.data, 0) != null) return failText(req.tag, E.INVAL, pane.e_name_char ++ ": a NUL"); |
