mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-21 06:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix build failures on 32-bit arm due to u64/usize coercion

Browse Source
This commit is contained in:
Andrew Kelley 2023-01-10 23:19:28 -07:00
parent fe8951cc94
commit 476cbe871a
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/std/http/Client.zig
View File

@ -625,6 +625,29 @@ pub const Request = struct {
InvalidSignature,
NotSquare,
DiskQuota,
InvalidEnd,
Incomplete,
InvalidIpv4Mapping,
InvalidIPAddressFormat,
BadPathName,
DeviceBusy,
FileBusy,
FileLocksNotSupported,
InvalidHandle,
InvalidUtf8,
NameTooLong,
NoDevice,
PathAlreadyExists,
PipeBusy,
SharingViolation,
SymLinkLoop,
FileSystem,
InterfaceNotFound,
AlreadyBound,
FileDescriptorNotASocket,
NetworkSubsystemFailed,
NotDir,
ReadOnlyFileSystem,
};
pub fn read(req: *Request, buffer: []u8) ReadError!usize {
@ -770,7 +793,8 @@ pub const Request = struct {
}
},
.chunk_data => {
const sub_amt = @min(req.response.next_chunk_length, in.len);
// TODO https://github.com/ziglang/zig/issues/14039
const sub_amt = @intCast(usize, @min(req.response.next_chunk_length, in.len));
req.response.next_chunk_length -= sub_amt;
if (req.response.next_chunk_length > 0) {
if (in.ptr == buffer.ptr) {

14
lib/std/tar.zig
View File

@ -93,7 +93,7 @@ pub fn pipeToFileSystem(dir: std.fs.Dir, reader: anytype, options: Options) !voi
start += 512;
const file_size = try header.fileSize();
const rounded_file_size = std.mem.alignForwardGeneric(u64, file_size, 512);
const pad_len = rounded_file_size - file_size;
const pad_len = @intCast(usize, rounded_file_size - file_size);
const unstripped_file_name = try header.fullFileName(&file_name_buffer);
switch (header.fileType()) {
.directory => {
@ -117,13 +117,15 @@ pub fn pipeToFileSystem(dir: std.fs.Dir, reader: anytype, options: Options) !voi
start = 0;
}
// Ask for the rounded up file size + 512 for the next header.
const ask = @min(
// TODO: https://github.com/ziglang/zig/issues/14039
const ask = @intCast(usize, @min(
buffer.len - end,
rounded_file_size + 512 - file_off -| (end - start),
);
));
end += try reader.readAtLeast(buffer[end..], ask);
if (end - start < ask) return error.UnexpectedEndOfStream;
const slice = buffer[start..@min(file_size - file_off + start, end)];
// TODO: https://github.com/ziglang/zig/issues/14039
const slice = buffer[start..@intCast(usize, @min(file_size - file_off + start, end))];
try file.writeAll(slice);
file_off += slice.len;
start += slice.len;
@ -136,8 +138,8 @@ pub fn pipeToFileSystem(dir: std.fs.Dir, reader: anytype, options: Options) !voi
}
},
.global_extended_header, .extended_header => {
start += rounded_file_size;
if (start > end) return error.TarHeadersTooBig;
if (start + rounded_file_size > end) return error.TarHeadersTooBig;
start = @intCast(usize, start + rounded_file_size);
},
.hard_link => return error.TarUnsupportedFileType,
.symbolic_link => return error.TarUnsupportedFileType,