Update ZigHEADmain

1 files changed, 19 insertions, 14 deletions

diff --git a/src/list.zig b/src/list.zig
index 9ff26c2..72f3d91 100644
--- a/src/list.zig
+++ b/src/list.zig
@@ -4,8 +4,10 @@ const zup = @import("root");
 const Allocator = std.mem.Allocator;
 const ArrayList = std.ArrayList;
 const Config = zup.Config;
+const File = std.fs.File;
 const Installation = zup.Installation;
 const Installations = zup.Installations;
+const Writer = std.io.Writer;
 
 pub const params =
     \\--active         List the active version
@@ -33,27 +35,33 @@ pub fn main(comptime Result: type, config: Config, res: Result) !void {
         list_installed = true;
     }
 
+    const buf = try allocator.alloc(u8, 4096);
+    defer allocator.free(buf);
+
+    var stdout = File.stdout().writer(buf);
+
     if (list_active) {
         const active = try Installation.getActiveName(allocator);
         defer if (active) |s| allocator.free(s);
-        try printActive(active);
+        try printActive(&stdout.interface, active);
     }
 
     if (list_installed) {
         var installed = try Installation.getInstalledList(allocator);
         defer Installation.deinitMap(allocator, &installed);
-        try printInstalledList(allocator, installed);
+        try printInstalledList(allocator, &stdout.interface, installed);
     }
 
     if (list_available) {
         var available = try Installation.getAvailableList(config);
         defer Installation.deinitMap(allocator, &available);
-        try printAvailableList(allocator, available);
+        try printAvailableList(allocator, &stdout.interface, available);
     }
+
+    try stdout.interface.flush();
 }
 
-fn printActive(active: ?[]const u8) !void {
-    const writer = std.io.getStdOut().writer();
+fn printActive(writer: *Writer, active: ?[]const u8) !void {
     try writer.writeAll("Active installation: ");
     if (active) |act| {
         try writer.writeAll(act);
@@ -64,19 +72,17 @@ fn printActive(active: ?[]const u8) !void {
     try writer.writeByte('\n');
 }
 
-fn printAvailableList(allocator: Allocator, avail: Installations) !void {
-    const writer = std.io.getStdOut().writer();
+fn printAvailableList(allocator: Allocator, writer: *Writer, avail: Installations) !void {
     try writer.writeAll("Available versions:\n");
-    try printList(allocator, avail);
+    try printList(allocator, writer, avail);
 }
 
-fn printInstalledList(allocator: Allocator, installed: Installations) !void {
-    const writer = std.io.getStdOut().writer();
+fn printInstalledList(allocator: Allocator, writer: *Writer, installed: Installations) !void {
     try writer.writeAll("Installed versions:\n");
-    try printList(allocator, installed);
+    try printList(allocator, writer, installed);
 }
 
-fn printList(allocator: Allocator, installations: Installations) !void {
+fn printList(allocator: Allocator, writer: *Writer, installations: Installations) !void {
     const InstallationAndName = struct {
         name: []const u8,
         installation: Installation,
@@ -98,8 +104,7 @@ fn printList(allocator: Allocator, installations: Installations) !void {
 
     std.mem.sort(InstallationAndName, list.items, {}, InstallationAndName.lessThan);
 
-    const writer = std.io.getStdOut().writer();
     for (list.items) |item| {
-        try writer.print("  {s}: {}\n", .{ item.name, item.installation.version });
+        try writer.print("  {s}: {f}\n", .{ item.name, item.installation.version });
     }
 }