Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-22 04:10:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge c6ac45bced into f845fa04a0

Browse Source
This commit is contained in:
Nuno Mendes 2024-11-21 08:05:39 +01:00 committed by GitHub
commit 13bb924aad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/std/fs/File.zig
View File

@ -1149,13 +1149,23 @@ pub fn readToEndAllocOptions(
comptime alignment: u29, comptime alignment: u29,
comptime optional_sentinel: ?u8, comptime optional_sentinel: ?u8,
) !(if (optional_sentinel) |s| [:s]align(alignment) u8 else []align(alignment) u8) { ) !(if (optional_sentinel) |s| [:s]align(alignment) u8 else []align(alignment) u8) {
// If no size hint is provided fall back to the size=0 code path var size: usize = undefined;
const size = size_hint orelse 0; if (size_hint) |hint| {
size = hint;
} else {
// If no size hint is provided the file size returned by stat() is used as a
// hint to set the buffer size.
const file_stat = self.stat();
if (file_stat) |value| {
size = std.math.cast(usize, value.size) orelse return error.FileTooBig;
} else |_| {
// If the reported size is zero or there was an error reading stat(),
// for example on Linux for files in /proc, a small buffer is allocated instead.
size = 1024;
}
}
// The file size returned by stat is used as hint to set the buffer const initial_cap = size + @intFromBool(optional_sentinel != null);
// size. If the reported size is zero, as it happens on Linux for files
// in /proc, a small buffer is allocated instead.
const initial_cap = (if (size > 0) size else 1024) + @intFromBool(optional_sentinel != null);
var array_list = try std.ArrayListAligned(u8, alignment).initCapacity(allocator, initial_cap); var array_list = try std.ArrayListAligned(u8, alignment).initCapacity(allocator, initial_cap);
defer array_list.deinit(); defer array_list.deinit();