diff options
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/main.zig b/src/main.zig index 1104aeb8..66d25816 100644 --- a/src/main.zig +++ b/src/main.zig @@ -85,6 +85,15 @@ const help_text = \\ PARDES_FS and PARDES_PANE into every pane shell \\ --fs=<dir> ...at <dir> instead. Must be absolute; pardes \\ unmounts it on exit but leaves the directory + \\ --fs9 serve that same tree over 9P2000 on a unix socket + \\ at $XDG_RUNTIME_DIR/pardes-9p-<name>.sock, where + \\ <name> is the session name or this pid. Dial it + \\ with `9p -a <socket>` or mount with `9pfuse`. + \\ Independent of --fs: either, both or neither + \\ --fs9=<name> ...named <name> rather than derived. One path + \\ component: no '/' and nothing empty. Served by + \\ --detach sessions today; the tty and GUI shells + \\ still take --fs only \\ --detach run this session with NO terminal of its own, \\ serving frontends over a unix socket beside the \\ nested-instance one. The core, the panes and the @@ -166,6 +175,8 @@ fn nativeMain(init: std.process.Init) !void { if (!std.mem.eql(u8, a, "--nested") and !std.mem.eql(u8, a, "--fs") and !std.mem.startsWith(u8, a, "--fs=") and + !std.mem.eql(u8, a, "--fs9") and + !std.mem.startsWith(u8, a, "--fs9=") and !std.mem.eql(u8, a, "--detach") and !std.mem.startsWith(u8, a, "--detach=") and !std.mem.eql(u8, a, "--attach") and @@ -211,6 +222,14 @@ fn nativeMain(init: std.process.Init) !void { // mount at ./README and open no file — the flag would silently eat // the FILE argument. One spelling, and it carries its own value. opts.fs = a["--fs=".len..]; + } else if (std.mem.eql(u8, a, "--fs9")) { + opts.fs9 = ""; + } else if (std.mem.startsWith(u8, a, "--fs9=")) { + // One spelling that carries its own value, for the reason `--fs` + // gives directly above: the flag is useful bare, so a two-word + // form would make `pardes --fs9 README` a socket called README + // that opens no file. + opts.fs9 = a["--fs9=".len..]; } else if (std.mem.eql(u8, a, "--nested")) { opts.nested = true; } else if (std.mem.eql(u8, a, "--detach")) { @@ -321,6 +340,12 @@ fn nativeMain(init: std.process.Init) !void { // that most wants a control filesystem, because it is the one whose panes // outlive every terminal that could otherwise have scripted them. if (opts.fs != null and attach != null) return error.BadArgs; + // ...and `--fs9` for exactly that reason and no other: it is the same tree + // over a different transport, and an `--attach` has no core to serve it + // from either. Checked separately rather than folded into the line above + // so that neither flag's refusal is a side effect of the other's — they + // are independent everywhere else. + if (opts.fs9 != null and attach != null) return error.BadArgs; // `--detach` replaces the frontend rather than choosing among them: the // core runs here, with no terminal, and the frontends are elsewhere on a // socket (src/detached/). It is checked before `platform` because it is not @@ -408,6 +433,14 @@ test { _ = @import("detached/wire.zig"); _ = @import("detached/server.zig"); _ = @import("detached/client.zig"); + // The 9P listener, and it needs its name here for the reason the + // panel_compositor line below states rather than the fuse.zig one above: + // detached/server.zig imports it, but naming a file does not make Zig + // analyse the tests of what IT imports — measured, by three tests that + // compiled and never ran. A standalone b.addTest is not an option either, + // because this file reaches pardes.zig (`Server(acmefs)`); src/9p.zig, the + // half that does NOT, has one in build.zig. + _ = @import("fs9_service.zig"); if (comptime pardes.platform == .tty) { _ = @import("tty/tty.zig"); // tty.zig calls the compositor only from its runtime loop, so merely |