cli: Escape server name and version in TSV output

Changes

1 changed files (+18/-6)

• cli/src/commands/server/list.zig
  • @@ -94,6 +94,8 @@
    switch (res.args.format orelse .text) { .text => { while (result.next()) |server| { + defer server.free(); + stdout.print("ID={s} IP={} VERSION=\"{s}\"\n", .{ server.getId(), server.getAddr(),
  • @@ -101,7 +103,6 @@ server.getVersion(),
    }) catch { return ExitCode.stdout_write_failed; }; - server.free(); } }, .tsv => {
  • @@ -111,26 +112,37 @@ return ExitCode.stdout_write_failed;
    }; } while (result.next()) |server| { - // TODO: Escape tabs from name and version + defer server.free(); + + const name = allocator.dupe(u8, server.getName()) catch { + return ExitCode.out_of_memory; + }; + std.mem.replaceScalar(u8, name, '\t', ' '); + + const version = allocator.dupe(u8, server.getVersion()) catch { + return ExitCode.out_of_memory; + }; + std.mem.replaceScalar(u8, version, '\t', ' '); + stdout.print("{s}\t{s}\t{}\t{s}\n", .{ server.getId(), - server.getName(), + name, server.getAddr(), - server.getVersion(), + version, }) catch { return ExitCode.stdout_write_failed; }; - server.free(); } }, .jsonl => { while (result.next()) |server| { + defer server.free(); + stdout.print("{}\n", .{ std.json.fmt(server, .{ .whitespace = .minified }), }) catch { return ExitCode.stdout_write_failed; }; - server.free(); } }, }