Commit 99c40d3

Eric Bower  ·  2026-04-08 22:35:27 -0400 EDT
parent 43e6f0f 
chore: use env var fn for session name
1 files changed,  +6, -14
M src/main.zig
M src/main.zig
+6, -14
......@@ -1043,11 +1043,7 @@ fn list(cfg: *Cfg, short: bool) !void {
10431043 defer _ = gpa.deinit();
10441044 const alloc = gpa.allocator();
10451045
1046- const current_session = std.process.getEnvVarOwned(alloc, "ZMX_SESSION") catch |err| switch (err) {
1047- error.EnvironmentVariableNotFound => null,
1048- else => return err,
1049- };
1050- defer if (current_session) |name| alloc.free(name);
1046+ const current_session = socket.getSeshNameFromEnv();
10511047 var buf: [4096]u8 = undefined;
10521048 var stdout = std.fs.File.stdout().writer(&buf);
10531049
......@@ -1080,14 +1076,11 @@ fn detachAll(cfg: *Cfg) !void {
10801076 var gpa = std.heap.GeneralPurposeAllocator(.{}){};
10811077 defer _ = gpa.deinit();
10821078 const alloc = gpa.allocator();
1083- const session_name = std.process.getEnvVarOwned(alloc, "ZMX_SESSION") catch |err| switch (err) {
1084- error.EnvironmentVariableNotFound => {
1085- std.log.err("ZMX_SESSION env var not found: are you inside a zmx session?", .{});
1086- return;
1087- },
1088- else => return err,
1089- };
1090- defer alloc.free(session_name);
1079+ const session_name = socket.getSeshNameFromEnv();
1080+ if (session_name.len == 0) {
1081+ std.log.err("ZMX_SESSION env var not found: are you inside a zmx session?", .{});
1082+ return;
1083+ }
10911084
10921085 var dir = try std.fs.openDirAbsolute(cfg.socket_dir, .{});
10931086 defer dir.close();
......@@ -1257,7 +1250,6 @@ fn attach(daemon: *Daemon) !void {
12571250 const sesh = socket.getSeshNameFromEnv();
12581251 if (sesh.len > 0) {
12591252 return switchSesh(daemon, sesh);
1260- // return error.CannotAttachToSessionInSession;
12611253 }
12621254
12631255 const result = try daemon.ensureSession();