summaryrefslogtreecommitdiff
path: root/src/ninep
diff options
context:
space:
mode:
Diffstat (limited to 'src/ninep')
-rw-r--r--src/ninep/addr.zig2
-rw-r--r--src/ninep/cols.zig10
-rw-r--r--src/ninep/ctl.zig14
-rw-r--r--src/ninep/events.zig10
-rw-r--r--src/ninep/pane.zig11
-rw-r--r--src/ninep/pty.zig6
-rw-r--r--src/ninep/screen.zig2
-rw-r--r--src/ninep/tree.zig16
8 files changed, 36 insertions, 35 deletions
diff --git a/src/ninep/addr.zig b/src/ninep/addr.zig
index b78c46e7..3feda5a2 100644
--- a/src/ninep/addr.zig
+++ b/src/ninep/addr.zig
@@ -646,7 +646,7 @@ test "the address language, form by form" {
try testing.expectEqualStrings(c[1], th.wr(p, addr, c[0]).reply.ename);
}
- const nested = "," ** 4096;
+ const nested = &@as([4096]u8, @splat(','));
_ = th.wr(p, addr, "#0");
try testing.expectEqual(E.INVAL, th.wr(p, addr, nested).errno());
}
diff --git a/src/ninep/cols.zig b/src/ninep/cols.zig
index e3b456ba..59f6ae42 100644
--- a/src/ninep/cols.zig
+++ b/src/ninep/cols.zig
@@ -288,18 +288,18 @@ test "exactly 4096 bytes written with echo's newline after a truncation fit ever
const p = try th.withFile(testing.allocator, "x\n");
defer p.deinit();
const serial = th.serialOf(p);
- const text = "w" ** 4096 ++ "\n";
+ const text = &@as([4096]u8, @splat('w')) ++ "\n";
for ([_]u64{ tree.Node.of(serial, .tag), tree.Node.ofCol(layout.columnSerial(p, 0), .tag), @intFromEnum(tree.TopFile.tag) }) |node| {
_ = th.call(p, .{ .tag = 1, .op = .setattr, .node = node, .truncate = true });
const h = th.call(p, .{ .tag = 2, .op = .open, .node = node, .omode = 1 }).reply.handle;
const r = th.call(p, .{ .tag = 3, .op = .write, .node = node, .handle = h, .data = text });
try testing.expectEqual(tree.Status.ok, r.reply.status);
_ = th.call(p, .{ .tag = 4, .op = .release, .node = node, .handle = h, .opened = true });
- try testing.expect(std.mem.endsWith(u8, th.rd(p, node, 0, 1 << 16).bytes, "w" ** 4096));
+ try testing.expect(std.mem.endsWith(u8, th.rd(p, node, 0, 1 << 16).bytes, &@as([4096]u8, @splat('w'))));
// One more byte is over.
_ = th.call(p, .{ .tag = 5, .op = .setattr, .node = node, .truncate = true });
const h2 = th.call(p, .{ .tag = 6, .op = .open, .node = node, .omode = 1 }).reply.handle;
- try testing.expectEqual(E.NOSPC, th.call(p, .{ .tag = 7, .op = .write, .node = node, .handle = h2, .data = "w" ** 4097 ++ "\n" }).errno());
+ try testing.expectEqual(E.NOSPC, th.call(p, .{ .tag = 7, .op = .write, .node = node, .handle = h2, .data = &@as([4097]u8, @splat('w')) ++ "\n" }).errno());
_ = th.call(p, .{ .tag = 8, .op = .release, .node = node, .handle = h2, .opened = true });
}
}
@@ -316,7 +316,7 @@ test "a Newcol refused because the tags would not fit logs its err alone and spe
for (p.col_panes[col][0..p.col_n[col]]) |k| {
const each = p.panes[k].?;
if (each.tag.own) |old| p.gpa.free(old);
- each.tag.own = try p.gpa.dupe(u8, "word " ** 60);
+ each.tag.own = try p.gpa.dupe(u8, std.mem.asBytes(&@as([60][5]u8, @splat("word ".*))));
}
try testing.expect(p.col_n[col] >= 2);
p.sync();
@@ -588,7 +588,7 @@ test "a refused write after a truncation leaves every kind of tag as it was, and
defer p.deinit();
const serial = th.serialOf(p);
const col = layout.columnSerial(p, 0);
- const big = "w" ** (limits.max_tag_tail + 1);
+ const big = &@as([limits.max_tag_tail + 1]u8, @splat('w'));
// Each tag: a truncating open, then a write too long: nothing changes.
for ([_]u64{ Node.of(serial, .tag), Node.ofCol(col, .tag), @intFromEnum(tree.TopFile.tag) }) |node| {
_ = th.wr(p, node, " Mine");
diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig
index f6457b83..6b4bbafb 100644
--- a/src/ninep/ctl.zig
+++ b/src/ninep/ctl.zig
@@ -1682,9 +1682,9 @@ test "a look's miss repeats the path whole up to 256 bytes, then gives up its mi
var line: [512]u8 = undefined;
_ = wr(p, root, try std.fmt.bufPrint(&line, "{s}\n", .{long}));
try testing.expect(th.logHas(p, try std.fmt.bufPrint(&line, "look: no match for \"{s}\"\n", .{long})));
- const huge = "é" ** 150; // 300 bytes: its middle cut to fit 256, between characters
+ const huge = std.mem.asBytes(&@as([150][2]u8, @splat("é".*))); // 300 bytes: its middle cut to fit 256, between characters
_ = wr(p, root, huge ++ "\n");
- try testing.expect(th.logHas(p, "look: no match for \"" ++ "é" ** 63 ++ "…" ++ "é" ** 63 ++ "\"\n"));
+ try testing.expect(th.logHas(p, "look: no match for \"" ++ std.mem.asBytes(&@as([63][2]u8, @splat("é".*))) ++ "…" ++ std.mem.asBytes(&@as([63][2]u8, @splat("é".*))) ++ "\"\n"));
}
test "exec runs a builtin at the pane and records the pane it acted on" {
@@ -2041,7 +2041,7 @@ test "Zerox twins dump their text once and come back on one buffer from a Restor
defer p.deinit();
const first = serialOf(p);
_ = wr(p, Node.of(first, .name), "/tmp/pardes-zerox-dump.txt\n");
- _ = wr(p, Node.of(first, .body), "unsaved " ** 64 ++ "\n");
+ _ = wr(p, Node.of(first, .body), std.mem.asBytes(&@as([64][8]u8, @splat("unsaved ".*))) ++ "\n");
try testing.expect(p.executeBuiltinLine(0, "Zerox"));
try testing.expect(p.executeBuiltinLine(0, "Zerox"));
try pardes.dump.dumpState(p);
@@ -2888,7 +2888,7 @@ test "a builtin that fails a ctl write logs only its err, so the same failure ag
test "an exec line over the command limit fails the write and says the limit; a builtin's may be longer" {
const p = try withFile(testing.allocator, "x\n");
defer p.deinit();
- const long = "echo " ++ "y" ** pardes.exec.command_max ++ "\n";
+ const long = "echo " ++ &@as([pardes.exec.command_max]u8, @splat('y')) ++ "\n";
const refused = wr(p, root_exec, long);
try testing.expectEqual(E.INVAL, refused.errno());
try testing.expectEqualStrings(e_too_long, refused.reply.ename);
@@ -2896,7 +2896,7 @@ test "an exec line over the command limit fails the write and says the limit; a
try testing.expect(th.logHas(p, try std.fmt.bufPrint(&rec, "err {d} exec: invalid command line: a command line is at most 1024 bytes", .{serialOf(p)})));
try testing.expectEqualStrings(e_control, wr(p, root_exec, "echo a\x01b\n").reply.ename);
try testing.expect(th.logHas(p, try std.fmt.bufPrint(&rec, "err {d} exec: invalid command line: it holds", .{serialOf(p)})));
- try testing.expectEqual(Status.ok, wr(p, root_exec, "Msg " ++ "z" ** 1100 ++ "\n").reply.status);
+ try testing.expectEqual(Status.ok, wr(p, root_exec, "Msg " ++ &@as([1100]u8, @splat('z')) ++ "\n").reply.status);
}
test "Edit's p and = never fail for want of room for +Errors: the text is logged instead" {
@@ -4012,8 +4012,8 @@ test "Back and Forward written to exec keep to the focused file, and JumpScope a
defer p.deinit();
var tmp = testing.tmpDir(.{});
defer tmp.cleanup();
- try tmp.dir.writeFile(testing.io, .{ .sub_path = "a.txt", .data = "row\n" ** 100 });
- try tmp.dir.writeFile(testing.io, .{ .sub_path = "b.txt", .data = "row\n" ** 100 });
+ try tmp.dir.writeFile(testing.io, .{ .sub_path = "a.txt", .data = std.mem.asBytes(&@as([100][4]u8, @splat("row\n".*))) });
+ try tmp.dir.writeFile(testing.io, .{ .sub_path = "b.txt", .data = std.mem.asBytes(&@as([100][4]u8, @splat("row\n".*))) });
var dir_buf: [4096]u8 = undefined;
const dir = dir_buf[0..try tmp.dir.realPath(testing.io, &dir_buf)];
var line: [4200]u8 = undefined;
diff --git a/src/ninep/events.zig b/src/ninep/events.zig
index 3910ac05..7b73dc0e 100644
--- a/src/ninep/events.zig
+++ b/src/ninep/events.zig
@@ -938,7 +938,7 @@ test "event records are acme's bytes, one per read, and .again when empty" {
try testing.expectEqualStrings("ML0 ", rd(p, event, 0, 4).bytes);
try testing.expectEqualStrings("3 4 3 one\n", rd(p, event, 0, 4096).bytes);
- const big = "z" ** max_record_text;
+ const big = &@as([max_record_text]u8, @splat('z'));
_ = noteAction(p, 0, .body_exec, 0, max_record_text, 0, big);
try testing.expectEqualStrings("MX0 256 0 0 \n", rd(p, event, 0, 4096).bytes);
@@ -1388,7 +1388,7 @@ test "opens of the log share the open records, and a closed one frees its record
test "a click in the body reports the offsets of the word it takes, so the record can be written back" {
const config = @import("../config.zig");
const gpa = testing.allocator;
- const text = "alpha qty beta\n qty\n\tqty\ndef f(qty): return qty.x\n" ++ "w" ** 100 ++ " qty\n";
+ const text = "alpha qty beta\n qty\n\tqty\ndef f(qty): return qty.x\n" ++ &@as([100]u8, @splat('w')) ++ " qty\n";
const p = try withFile(gpa, text);
defer p.deinit();
// A scratch made over 9P, clicked while another pane has the keyboard.
@@ -1459,7 +1459,7 @@ test "follow new skips what the log held and waits for what comes after" {
test "a long msg record is cut between words at its cap, with an ellipsis" {
const p = try withFile(testing.allocator, "x\n");
defer p.deinit();
- const long = "word " ** 60; // 300 bytes
+ const long = std.mem.asBytes(&@as([60][5]u8, @splat("word ".*))); // 300 bytes
_ = wr(p, Node.of(serialOf(p), .ctl), "Msg " ++ long ++ "\n");
const log = @intFromEnum(tree.TopFile.log);
const h = call(p, .{ .tag = 1, .op = .open, .node = log }).reply.handle;
@@ -1485,7 +1485,7 @@ test "a record is one line of UTF-8: DEL and C1 are spaces, bytes not UTF-8 are
test "a long err record keeps its end, its middle given up to an ellipsis" {
const p = try withFile(testing.allocator, "x\n");
defer p.deinit();
- _ = wr(p, @intFromEnum(tree.TopFile.ctl), "Bogus" ++ "abcdefgh" ** 40 ++ "\n");
+ _ = wr(p, @intFromEnum(tree.TopFile.ctl), "Bogus" ++ std.mem.asBytes(&@as([40][8]u8, @splat("abcdefgh".*))) ++ "\n");
const log = @intFromEnum(tree.TopFile.log);
const h = call(p, .{ .tag = 1, .op = .open, .node = log }).reply.handle;
const text = call(p, .{ .tag = 2, .op = .read, .node = log, .handle = h, .size = 1 << 16 }).bytes;
@@ -1500,7 +1500,7 @@ test "a long err record keeps its end, its middle given up to an ellipsis" {
test "two failures that agree only in what their records cut are two records, not one counted" {
const p = try th.withFile(testing.allocator, "x\n");
defer p.deinit();
- const long = "why " ** 80;
+ const long = std.mem.asBytes(&@as([80][4]u8, @splat("why ".*)));
p.setMessage(0, long ++ "first");
p.setMessage(0, long ++ "second");
try testing.expect(!th.logHas(p, "(x2)"));
diff --git a/src/ninep/pane.zig b/src/ninep/pane.zig
index 3b70d62f..8605cab8 100644
--- a/src/ninep/pane.zig
+++ b/src/ninep/pane.zig
@@ -1427,7 +1427,7 @@ test "a tag write past the limit is refused whole, naming the limit" {
const tag = Node.of(serialOf(p), .tag);
const before = try testing.allocator.dupe(u8, rd(p, tag, 0, 1 << 16).bytes);
defer testing.allocator.free(before);
- const big = "w" ** (limits.max_tag_tail + 10);
+ const big = &@as([limits.max_tag_tail + 10]u8, @splat('w'));
const r = wr(p, tag, big);
try testing.expectEqual(E.NOSPC, r.errno());
// `no space` is what 9ns maps to ENOSPC, so a shell through a mount
@@ -1549,20 +1549,21 @@ test "a name with a component over 255 bytes is refused, and a long path's faile
const p = try withFile(testing.allocator, "x\n");
defer p.deinit();
const serial = serialOf(p);
- const refused = wr(p, Node.of(serial, .name), "/tmp/" ++ "c" ** 256 ++ "/f.txt\n");
+ const refused = wr(p, Node.of(serial, .name), "/tmp/" ++ &@as([256]u8, @splat('c')) ++ "/f.txt\n");
try testing.expectEqual(E.INVAL, refused.errno());
try testing.expectEqualStrings("invalid file name: a component over 255 bytes", refused.reply.ename);
- try testing.expectEqual(Status.ok, wr(p, Node.of(serial, .name), "/tmp/" ++ "c" ** 255 ++ "\n").reply.status);
+ try testing.expectEqual(Status.ok, wr(p, Node.of(serial, .name), "/tmp/" ++ &@as([255]u8, @splat('c')) ++ "\n").reply.status);
// Held with no newline, it is refused by that write, not at the close.
const held = call(p, .{ .tag = 1, .op = .open, .node = Node.of(serial, .name), .omode = 1 }).reply.handle;
- try testing.expectEqual(E.INVAL, call(p, .{ .tag = 2, .op = .write, .node = Node.of(serial, .name), .handle = held, .data = "/tmp/" ++ "e" ** 256 }).errno());
+ try testing.expectEqual(E.INVAL, call(p, .{ .tag = 2, .op = .write, .node = Node.of(serial, .name), .handle = held, .data = "/tmp/" ++ &@as([256]u8, @splat('e')) }).errno());
_ = call(p, .{ .tag = 3, .op = .release, .node = Node.of(serial, .name), .handle = held, .opened = true });
try testing.expectEqual(@as(usize, 0), p.fs.closed_lines.items.len);
// A Save of a 3000-byte path the host refuses: the waiting write's
// reason is at the end, the path giving up its middle.
// (Under /tmp: under / a user's Save is refused permission, not
// missing.)
- const long = "/tmp/nonexistent-pardes-root/" ++ ("d" ** 200 ++ "/") ** 15 ++ "f.txt";
+ const segment = &@as([200]u8, @splat('d')) ++ "/";
+ const long = "/tmp/nonexistent-pardes-root/" ++ std.mem.asBytes(&@as([15][201]u8, @splat(segment.*))) ++ "f.txt";
const id = p.paneBySerial(serial).?;
try nameBuffer(p, id, long, false);
p.fs.late_failure_len = 0;
diff --git a/src/ninep/pty.zig b/src/ninep/pty.zig
index c58cf676..aeb57a00 100644
--- a/src/ninep/pty.zig
+++ b/src/ninep/pty.zig
@@ -1044,12 +1044,12 @@ test "a run's answer says cut when its output's start is gone, and reads a bound
const q = try withTerm(gpa);
defer q.deinit();
const kept = q.panes[0].?;
- kept.terminal.?.vt.screens.get(.primary).?.pages.explicit_max_size = 1;
+ kept.terminal.?.vt.screens.get(.primary).?.pages.limits.set(.bytes, 1);
const run = Node.of(serialOf(q), .pty_run);
sh.put(q, prompt);
h = sh.send(q, run);
sh.put(q, c);
- const lines = "pruned\r\n" ** 64;
+ const lines = std.mem.asBytes(&@as([64][8]u8, @splat("pruned\r\n".*)));
var fed: usize = 0;
while (!kept.terminal.?.stream.handler.out_start.?.garbage) : (fed += 1) {
if (fed == 1000) return error.TestUnexpectedResult;
@@ -1146,7 +1146,7 @@ test "a run's answer longer than its room is cut, its newline kept" {
var slot: Run = .{};
const p = try th.withTerm(testing.allocator);
defer p.deinit();
- answer(p, &slot, "busy: {s} is running", .{"x" ** 200});
+ answer(p, &slot, "busy: {s} is running", .{&@as([200]u8, @splat('x'))});
try testing.expectEqual(slot.answer.len, slot.len);
try testing.expectEqual(@as(u8, '\n'), slot.answer[slot.len - 1]);
}
diff --git a/src/ninep/screen.zig b/src/ninep/screen.zig
index b991c3e4..8d4707e0 100644
--- a/src/ninep/screen.zig
+++ b/src/ninep/screen.zig
@@ -333,7 +333,7 @@ test "a terminal's body is its logical lines: a row the terminal wrapped is join
const p = try th.withTerm(testing.allocator);
defer p.deinit();
const pane = p.panes[0].?;
- const long = "w" ** 50 ++ "x" ** 150; // wider than the pane: it wraps
+ const long = &@as([50]u8, @splat('w')) ++ &@as([150]u8, @splat('x')); // wider than the pane: it wraps
try testing.expect(long.len > pane.cols);
p.update(.{ .output = .{ .pane = 0, .bytes = long ++ "\r\nnext" } });
while (p.nextEffect()) |_| {}
diff --git a/src/ninep/tree.zig b/src/ninep/tree.zig
index eedab43b..5678832b 100644
--- a/src/ninep/tree.zig
+++ b/src/ninep/tree.zig
@@ -509,7 +509,7 @@ pub fn fitErr(text: []const u8, out: []u8) []const u8 {
test "a reason past 128 bytes keeps its end: the path in it gives up its middle" {
var out: [128]u8 = undefined;
- const long = "Save /home/someone/projects/" ++ "deep/" ** 30 ++ "file.txt: no such directory";
+ const long = "Save /home/someone/projects/" ++ std.mem.asBytes(&@as([30][5]u8, @splat("deep/".*))) ++ "file.txt: no such directory";
const fit = fitErr(long, &out);
try testing.expect(fit.len <= 128);
try testing.expect(std.mem.startsWith(u8, fit, "Save /home/someone/"));
@@ -517,7 +517,7 @@ test "a reason past 128 bytes keeps its end: the path in it gives up its middle"
try testing.expect(std.mem.indexOf(u8, fit, "…") != null);
try testing.expect(std.unicode.utf8ValidateSlice(fit));
// No path: the whole text's middle goes, the end stays.
- const words = "why " ** 40 ++ "the reason";
+ const words = std.mem.asBytes(&@as([40][4]u8, @splat("why ".*))) ++ "the reason";
try testing.expect(std.mem.endsWith(u8, fitErr(words, &out), "the reason"));
try testing.expectEqualStrings("short", fitErr("short", &out));
// Through the tree: a look at a long ./ name not there, a miss, says
@@ -525,7 +525,7 @@ test "a reason past 128 bytes keeps its end: the path in it gives up its middle"
const p = try th.withFile(testing.allocator, "x\n");
defer p.deinit();
var line: [512]u8 = undefined;
- const r = th.wr(p, Node.of(serialOf(p), .look), try std.fmt.bufPrint(&line, "./{s}x.txt\n", .{"no-such-dir/" ** 20}));
+ const r = th.wr(p, Node.of(serialOf(p), .look), try std.fmt.bufPrint(&line, "./{s}x.txt\n", .{std.mem.asBytes(&@as([20][12]u8, @splat("no-such-dir/".*)))}));
try testing.expectEqual(Status.ok, r.reply.status);
try testing.expect(th.logHas(p, "x.txt: no such file"));
}
@@ -1492,17 +1492,17 @@ test "README names every file the tree serves" {
return false;
}
};
- inline for (@typeInfo(TopFile).@"enum".fields) |f| {
- const t: TopFile = @enumFromInt(f.value);
+ inline for (@typeInfo(TopFile).@"enum".field_values) |value| {
+ const t: TopFile = @enumFromInt(value);
if (t != .root and !words.has(t.fileName())) {
std.debug.print("README does not mention /{s}\n", .{t.fileName()});
return error.Undocumented;
}
}
- inline for (@typeInfo(PaneFile).@"enum".fields) |f| {
- const t: PaneFile = @enumFromInt(f.value);
+ inline for (@typeInfo(PaneFile).@"enum".field_values) |value| {
+ const t: PaneFile = @enumFromInt(value);
const ok = if (t == .dir) true else if (t.inPty() and t != .pty)
- std.mem.indexOf(u8, fs.help, "pty/" ++ comptime @as(PaneFile, @enumFromInt(f.value)).fileName()) != null
+ std.mem.indexOf(u8, fs.help, "pty/" ++ comptime @as(PaneFile, @enumFromInt(value)).fileName()) != null
else
words.has(t.fileName());
if (!ok) {