authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-10-19 22:16:27+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-10-22 07:59:23+02:00
logbc1e714de6377173257f0b1f01a85b1d18a35a19
tree8e772861ce4e538d5a975e5be54496fb9b613217
parent15f1e6a60c1b31a058e1a2f4638a1628b71d52a0

macho: revert changes to file descriptors mgmt

2 files changed, 3 insertions(+), 6 deletions(-)

src/link/MachO/Archive.zig+3-2
...@@ -3,7 +3,7 @@ const Archive = @This();...@@ -3,7 +3,7 @@ const Archive = @This();
3const std = @import("std");3const std = @import("std");
4const assert = std.debug.assert;4const assert = std.debug.assert;
5const fs = std.fs;5const fs = std.fs;
6const log = std.log.scoped(.macho);6const log = std.log.scoped(.link);
7const macho = std.macho;7const macho = std.macho;
8const mem = std.mem;8const mem = std.mem;
99
...@@ -88,6 +88,7 @@ const ar_hdr = extern struct {...@@ -88,6 +88,7 @@ const ar_hdr = extern struct {
88};88};
8989
90pub fn deinit(self: *Archive, allocator: Allocator) void {90pub fn deinit(self: *Archive, allocator: Allocator) void {
91 self.file.close();
91 for (self.toc.keys()) |*key| {92 for (self.toc.keys()) |*key| {
92 allocator.free(key.*);93 allocator.free(key.*);
93 }94 }
...@@ -217,7 +218,7 @@ pub fn parseObject(...@@ -217,7 +218,7 @@ pub fn parseObject(
217 const contents = try gpa.allocWithOptions(u8, object_size, @alignOf(u64), null);218 const contents = try gpa.allocWithOptions(u8, object_size, @alignOf(u64), null);
218 const amt = try reader.readAll(contents);219 const amt = try reader.readAll(contents);
219 if (amt != object_size) {220 if (amt != object_size) {
220 return error.Io;221 return error.InputOutput;
221 }222 }
222223
223 var object = Object{224 var object = Object{
src/link/MachO/zld.zig-4
...@@ -1420,10 +1420,6 @@ pub const Zld = struct {...@@ -1420,10 +1420,6 @@ pub const Zld = struct {
1420 pub fn deinit(self: *Zld) void {1420 pub fn deinit(self: *Zld) void {
1421 const gpa = self.gpa;1421 const gpa = self.gpa;
14221422
1423 for (self.archives.items) |archive| {
1424 archive.file.close();
1425 }
1426
1427 self.tlv_ptr_entries.deinit(gpa);1423 self.tlv_ptr_entries.deinit(gpa);
1428 self.tlv_ptr_table.deinit(gpa);1424 self.tlv_ptr_table.deinit(gpa);
1429 self.got_entries.deinit(gpa);1425 self.got_entries.deinit(gpa);