Commit d0683a3
Eric Bower
·
2026-03-11 10:10:31 -0400 EDT
parent 1fc6306
chore(history): bare `zmx history` should try to use `ZMX_SESSION`
2 files changed,
+7,
-2
+3,
-2
| ... | ... | @@ -92,7 +92,8 @@ pub fn main() !void { | |
| 92 | 92 | session_name = arg; | |
| 93 | 93 | } | |
| 94 | 94 | } | |
| 95 | - | const sesh = try socket.getSeshName(alloc, session_name orelse ""); | |
| 95 | + | const sesh_env = socket.getSeshNameFromEnv(); | |
| 96 | + | const sesh = try socket.getSeshName(alloc, session_name orelse sesh_env); | |
| 96 | 97 | defer alloc.free(sesh); | |
| 97 | 98 | return history(&cfg, sesh, format); | |
| 98 | 99 | } else if (std.mem.eql(u8, cmd, "attach") or std.mem.eql(u8, cmd, "a")) { |
| ... | ... | @@ -967,7 +968,7 @@ fn history(cfg: *Cfg, session_name: []const u8, format: util.HistoryFormat) !voi | |
| 967 | 968 | } | |
| 968 | 969 | ||
| 969 | 970 | fn attach(daemon: *Daemon) !void { | |
| 970 | - | if (std.posix.getenv("ZMX_SESSION")) |_| { | |
| 971 | + | if (socket.getSeshNameFromEnv()) |_| { | |
| 971 | 972 | return error.CannotAttachToSessionInSession; | |
| 972 | 973 | } | |
| 973 | 974 |
+4,
-0
| ... | ... | @@ -5,6 +5,10 @@ pub fn seshPrefix() []const u8 { | |
| 5 | 5 | return std.posix.getenv("ZMX_SESSION_PREFIX") orelse ""; | |
| 6 | 6 | } | |
| 7 | 7 | ||
| 8 | + | pub fn getSeshNameFromEnv() []const u8 { | |
| 9 | + | return std.posix.getenv("ZMX_SESSION") orelse ""; | |
| 10 | + | } | |
| 11 | + | ||
| 8 | 12 | pub fn getSeshName(alloc: std.mem.Allocator, sesh: []const u8) ![]const u8 { | |
| 9 | 13 | const prefix = seshPrefix(); | |
| 10 | 14 | if (prefix.len == 0 and sesh.len == 0) { |