From ba8a84c4784b7270ddbdc346459100434200de3a Mon Sep 17 00:00:00 2001 From: Robby Zambito Date: Sat, 24 Jan 2026 14:26:24 -0500 Subject: Don't create dangling references Apparently things die at the end of blk scopes. --- src/main.zig | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'src/main.zig') diff --git a/src/main.zig b/src/main.zig index 13bce57..01ff410 100644 --- a/src/main.zig +++ b/src/main.zig @@ -66,12 +66,7 @@ pub fn main(init: std.process.Init) !void { .connect => { i += 1; if (i < args.len) { - var w: Writer = blk: { - var buf: [2048]u8 = undefined; - break :blk .fixed(&buf); - }; - try w.printBase64(args[i]); - flags.connect = w.buffered(); + flags.connect = args[i]; } else { flags.connect = ""; } @@ -130,7 +125,12 @@ pub fn main(init: std.process.Init) !void { if (flags.connect != null) { reconnect: while (true) { log.debug("Starting connection", .{}); - var connection = try client.connect(init.io, flags.connect.?); + + var init_con_buf: [SaprusClient.max_payload_len]u8 = undefined; + var w: Writer = .fixed(&init_con_buf); + try w.print("{b64}", .{flags.connect.?}); + var connection = try client.connect(init.io, w.buffered()); + log.debug("Connection started", .{}); while (true) { @@ -158,11 +158,8 @@ pub fn main(init: std.process.Init) !void { try child.collectOutput(init.gpa, &child_stdout, &child_stderr, std.math.maxInt(usize)); - // const b64e = std.base64.standard.Encoder; - var cmd_output: Writer = blk: { - var cmd_output_buf: [2048]u8 = undefined; - break :blk .fixed(&cmd_output_buf); - }; + var cmd_output_buf: [2048]u8 = undefined; + var cmd_output: Writer = .fixed(&cmd_output_buf); var cmd_output_window_iter = std.mem.window(u8, child_stdout.items, SaprusClient.max_payload_len, SaprusClient.max_payload_len); while (cmd_output_window_iter.next()) |chunk| { -- cgit