From bc1e714de6377173257f0b1f01a85b1d18a35a19 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Wed, 19 Oct 2022 22:16:27 +0200
Subject: [PATCH] macho: revert changes to file descriptors mgmt

---
 src/link/MachO/Archive.zig | 5 +++--
 src/link/MachO/zld.zig     | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/link/MachO/Archive.zig b/src/link/MachO/Archive.zig
index 1874d3292b..d222394ad5 100644
--- a/src/link/MachO/Archive.zig
+++ b/src/link/MachO/Archive.zig
@@ -3,7 +3,7 @@ const Archive = @This();
 const std = @import("std");
 const assert = std.debug.assert;
 const fs = std.fs;
-const log = std.log.scoped(.macho);
+const log = std.log.scoped(.link);
 const macho = std.macho;
 const mem = std.mem;
 
@@ -88,6 +88,7 @@ const ar_hdr = extern struct {
 };
 
 pub fn deinit(self: *Archive, allocator: Allocator) void {
+    self.file.close();
     for (self.toc.keys()) |*key| {
         allocator.free(key.*);
     }
@@ -217,7 +218,7 @@ pub fn parseObject(
     const contents = try gpa.allocWithOptions(u8, object_size, @alignOf(u64), null);
     const amt = try reader.readAll(contents);
     if (amt != object_size) {
-        return error.Io;
+        return error.InputOutput;
     }
 
     var object = Object{
diff --git a/src/link/MachO/zld.zig b/src/link/MachO/zld.zig
index f9688acf33..8caecd2465 100644
--- a/src/link/MachO/zld.zig
+++ b/src/link/MachO/zld.zig
@@ -1420,10 +1420,6 @@ pub const Zld = struct {
     pub fn deinit(self: *Zld) void {
         const gpa = self.gpa;
 
-        for (self.archives.items) |archive| {
-            archive.file.close();
-        }
-
         self.tlv_ptr_entries.deinit(gpa);
         self.tlv_ptr_table.deinit(gpa);
         self.got_entries.deinit(gpa);