AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-08-03 03:06:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid realPathAlloc in caching of _defaults

Browse Source 
fixes #1351
This commit is contained in:
IntegratedQuantum 2025-08-01 17:03:08 +02:00
parent 29d72d00e1
commit 047e29fe72
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/assets.zig
View File

@ -155,14 +155,11 @@ pub const Assets = struct {
self.localArena.deinit(); self.localArena.deinit();
} }
fn get(self: *Defaults, dir: std.fs.Dir) ZonElement { fn get(self: *Defaults, dir: std.fs.Dir, dirPath: []const u8) ZonElement {
const path = dir.realpathAlloc(main.stackAllocator.allocator, ".") catch unreachable; const result = self.defaults.getOrPut(self.localAllocator.allocator, dirPath) catch unreachable;
defer main.stackAllocator.free(path);
const result = self.defaults.getOrPut(self.localAllocator.allocator, path) catch unreachable;
if(!result.found_existing) { if(!result.found_existing) {
result.key_ptr.* = self.localAllocator.dupe(u8, path); result.key_ptr.* = self.localAllocator.dupe(u8, dirPath);
const default: ZonElement = self.read(dir) catch |err| blk: { const default: ZonElement = self.read(dir) catch |err| blk: {
std.log.err("Failed to read default file: {s}", .{@errorName(err)}); std.log.err("Failed to read default file: {s}", .{@errorName(err)});
break :blk .null; break :blk .null;
@ -224,7 +221,7 @@ pub const Assets = struct {
continue; continue;
}; };
if(hasDefaults) { if(hasDefaults) {
zon.join(defaultsStorage.get(entry.dir)); zon.join(defaultsStorage.get(entry.dir, entry.path[0 .. entry.path.len - entry.basename.len]));
} }
output.put(allocator.allocator, id, zon) catch unreachable; output.put(allocator.allocator, id, zon) catch unreachable;
} }