An error on a column's ctl, exec or rmdir names that file in the log

noteError named every column node col/<serial>/tag, so a refused ctl write
or rmdir pointed at the tag. It now names col/<serial>/ctl, /exec, /tag or
the directory itself.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

2 files changed, 8 insertions, 3 deletions

diff --git a/src/ninep/cols.zig b/src/ninep/cols.zig
index b6dc7d26..49df715a 100644
--- a/src/ninep/cols.zig
+++ b/src/ninep/cols.zig
@@ -257,10 +257,12 @@ test "a column's ctl and exec act on it as its tag would, and rmdir closes it on
     try testing.expectEqual(tree.Status.ok, th.wr(p, Node.ofCol(empty, .ctl), "New\n").reply.status);
     try testing.expectEqual(@as(usize, 1), p.col_n[1]);
     try testing.expectEqual(E.INVAL, th.wr(p, Node.ofCol(empty, .ctl), "Exit\n").errno());
+    var rec: [64]u8 = undefined;
+    try testing.expect(th.logHas(p, try std.fmt.bufPrint(&rec, "err - col/{d}/ctl: a column's ctl takes", .{empty})));
     // rmdir refuses a column with a pane, and says why.
     const full = th.call(p, .{ .tag = 1, .op = .release, .node = Node.ofCol(empty, .dir), .remove = true });
     try testing.expectEqual(E.NOTEMPTY, full.errno());
-    try testing.expect(th.logHas(p, "column not empty"));
+    try testing.expect(th.logHas(p, try std.fmt.bufPrint(&rec, "err - col/{d}: column not empty", .{empty})));
     // exec runs a word as a click in that column's tag: Delcol closes it.
     try testing.expectEqual(tree.Status.ok, th.wr(p, Node.ofCol(empty, .exec), "Delcol\n").reply.status);
     try testing.expectEqual(@as(?usize, null), layout.columnBySerial(p, empty));
diff --git a/src/ninep/events.zig b/src/ninep/events.zig
index ccc61352..7402a763 100644
--- a/src/ninep/events.zig
+++ b/src/ninep/events.zig
@@ -165,7 +165,7 @@ pub fn notePath(p: *Pardes, what: []const u8, path: []const u8) void {
 
 pub fn noteError(p: *Pardes, req: Req, reply: Reply) void {
     const why = if (reply.ename.len > 0) reply.ename else cloud9.fs.errString(reply.errno);
-    var name: [16]u8 = undefined;
+    var name: [32]u8 = undefined;
     var serial: []const u8 = "-";
     var file: []const u8 = "os";
     if (req.node & tree.sources.archive_node != 0) file = "src";
@@ -174,7 +174,10 @@ pub fn noteError(p: *Pardes, req: Req, reply: Reply) void {
             .top => |f| file = f.fileName(),
             .col => |c| {
                 serial = "-";
-                file = std.fmt.bufPrint(&name, "col/{d}/tag", .{c.serial}) catch "col";
+                file = (if (c.file == .dir)
+                    std.fmt.bufPrint(&name, "col/{d}", .{c.serial})
+                else
+                    std.fmt.bufPrint(&name, "col/{d}/{s}", .{ c.serial, @tagName(c.file) })) catch "col";
             },
             .pane => |pt| {
                 serial = std.fmt.bufPrint(&name, "{d}", .{pt.serial}) catch "-";