From 8695b9fbe781ea030bafb4f6272202b9115ba46b Mon Sep 17 00:00:00 2001 From: daurnimator Date: Thu, 19 Nov 2020 02:10:14 +1100 Subject: std: use reader.skipBytes to avoid infinite loop in writeFileAllUnseekable skipBytes correctly handles EOF for us --- lib/std/fs/file.zig | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'lib/std/fs') diff --git a/lib/std/fs/file.zig b/lib/std/fs/file.zig index faf3687a4c..7acbc9e2f6 100644 --- a/lib/std/fs/file.zig +++ b/lib/std/fs/file.zig @@ -698,7 +698,7 @@ pub const File = struct { header_count: usize = 0, }; - pub const WriteFileError = ReadError || WriteError; + pub const WriteFileError = ReadError || error{EndOfStream} || WriteError; pub fn writeFileAll(self: File, in_file: File, args: WriteFileOptions) WriteFileError!void { return self.writeFileAllSendfile(in_file, args) catch |err| switch (err) { @@ -722,16 +722,9 @@ pub const File = struct { try self.writevAll(headers); + try in_file.reader().skipBytes(args.in_offset, .{ .buf_size = 4096 }); + var buffer: [4096]u8 = undefined; - { - var index: usize = 0; - // Skip in_offset bytes. - while (index < args.in_offset) { - const ask = math.min(buffer.len, args.in_offset - index); - const amt = try in_file.read(buffer[0..ask]); - index += amt; - } - } const in_len = args.in_len orelse math.maxInt(u64); var index: usize = 0; while (index < in_len) { -- cgit v1.2.3 From 01d1a8a783883414bd694731c7c2bfbd054b9a46 Mon Sep 17 00:00:00 2001 From: daurnimator Date: Thu, 19 Nov 2020 02:31:55 +1100 Subject: std: use fifo.pump in writeFileAllUnseekable --- lib/std/fs/file.zig | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lib/std/fs') diff --git a/lib/std/fs/file.zig b/lib/std/fs/file.zig index 7acbc9e2f6..45cb5e3218 100644 --- a/lib/std/fs/file.zig +++ b/lib/std/fs/file.zig @@ -724,14 +724,12 @@ pub const File = struct { try in_file.reader().skipBytes(args.in_offset, .{ .buf_size = 4096 }); - var buffer: [4096]u8 = undefined; - const in_len = args.in_len orelse math.maxInt(u64); - var index: usize = 0; - while (index < in_len) { - const ask = math.min(buffer.len, in_len - index); - const amt = try in_file.read(buffer[0..ask]); - if (amt == 0) break; - index += try self.write(buffer[0..amt]); + var fifo = std.fifo.LinearFifo(u8, .{ .Static = 4096 }).init(); + if (args.in_len) |len| { + var stream = std.io.earlyEOFReader(in_file.reader(), len); + try fifo.pump(stream.reader(), self.writer()); + } else { + try fifo.pump(in_file.reader(), self.writer()); } try self.writevAll(trailers); -- cgit v1.2.3 From d68adc5382a29687d2e24e27d9877473346a25e1 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 11 Jan 2021 16:51:56 -0700 Subject: std.EarlyEOFReader: rename to LimitedReader --- CMakeLists.txt | 2 +- lib/std/fs/file.zig | 2 +- lib/std/io.zig | 4 ++-- lib/std/io/early_eof_reader.zig | 50 ----------------------------------------- lib/std/io/limited_reader.zig | 50 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 lib/std/io/early_eof_reader.zig create mode 100644 lib/std/io/limited_reader.zig (limited to 'lib/std/fs') diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d02749d26..0dfec5a953 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -377,9 +377,9 @@ set(ZIG_STAGE2_SOURCES "${CMAKE_SOURCE_DIR}/lib/std/io/change_detection_stream.zig" "${CMAKE_SOURCE_DIR}/lib/std/io/counting_reader.zig" "${CMAKE_SOURCE_DIR}/lib/std/io/counting_writer.zig" - "${CMAKE_SOURCE_DIR}/lib/std/io/early_eof_reader.zig" "${CMAKE_SOURCE_DIR}/lib/std/io/find_byte_writer.zig" "${CMAKE_SOURCE_DIR}/lib/std/io/fixed_buffer_stream.zig" + "${CMAKE_SOURCE_DIR}/lib/std/io/limited_reader.zig" "${CMAKE_SOURCE_DIR}/lib/std/io/reader.zig" "${CMAKE_SOURCE_DIR}/lib/std/io/seekable_stream.zig" "${CMAKE_SOURCE_DIR}/lib/std/io/writer.zig" diff --git a/lib/std/fs/file.zig b/lib/std/fs/file.zig index 45cb5e3218..6002770f55 100644 --- a/lib/std/fs/file.zig +++ b/lib/std/fs/file.zig @@ -726,7 +726,7 @@ pub const File = struct { var fifo = std.fifo.LinearFifo(u8, .{ .Static = 4096 }).init(); if (args.in_len) |len| { - var stream = std.io.earlyEOFReader(in_file.reader(), len); + var stream = std.io.limitedReader(in_file.reader(), len); try fifo.pump(stream.reader(), self.writer()); } else { try fifo.pump(in_file.reader(), self.writer()); diff --git a/lib/std/io.zig b/lib/std/io.zig index fa0d5d8698..e9a03445f6 100644 --- a/lib/std/io.zig +++ b/lib/std/io.zig @@ -125,8 +125,8 @@ pub const fixedBufferStream = @import("io/fixed_buffer_stream.zig").fixedBufferS pub const CWriter = @import("io/c_writer.zig").CWriter; pub const cWriter = @import("io/c_writer.zig").cWriter; -pub const EarlyEOFReader = @import("io/early_eof_reader.zig").EarlyEOFReader; -pub const earlyEOFReader = @import("io/early_eof_reader.zig").earlyEOFReader; +pub const LimitedReader = @import("io/limited_reader.zig").LimitedReader; +pub const limitedReader = @import("io/limited_reader.zig").limitedReader; pub const CountingWriter = @import("io/counting_writer.zig").CountingWriter; pub const countingWriter = @import("io/counting_writer.zig").countingWriter; diff --git a/lib/std/io/early_eof_reader.zig b/lib/std/io/early_eof_reader.zig deleted file mode 100644 index 5ddb340455..0000000000 --- a/lib/std/io/early_eof_reader.zig +++ /dev/null @@ -1,50 +0,0 @@ -// SPDX-License-Identifier: MIT -// Copyright (c) 2015-2020 Zig Contributors -// This file is part of [zig](https://ziglang.org/), which is MIT licensed. -// The MIT license requires this copyright notice to be included in all copies -// and substantial portions of the software. -const std = @import("../std.zig"); -const io = std.io; -const assert = std.debug.assert; -const testing = std.testing; - -pub fn EarlyEOFReader(comptime ReaderType: type) type { - return struct { - inner_reader: ReaderType, - bytes_left: u64, - - pub const Error = ReaderType.Error; - pub const Reader = io.Reader(*Self, Error, read); - - const Self = @This(); - - pub fn read(self: *Self, dest: []u8) Error!usize { - const max_read = std.math.min(self.bytes_left, dest.len); - const n = try self.inner_reader.read(dest[0..max_read]); - self.bytes_left -= n; - return n; - } - - pub fn reader(self: *Self) Reader { - return .{ .context = self }; - } - }; -} - -/// Returns an initialised `EarlyEOFReader` -/// `bytes_left` is a `u64` to be able to take 64 bit file offsets -pub fn earlyEOFReader(inner_reader: anytype, bytes_left: u64) EarlyEOFReader(@TypeOf(inner_reader)) { - return .{ .inner_reader = inner_reader, .bytes_left = bytes_left }; -} - -test "io.EarlyEOFReader" { - const data = "hello world"; - var fbs = std.io.fixedBufferStream(data); - var early_stream = earlyEOFReader(fbs.reader(), 3); - - var buf: [5]u8 = undefined; - testing.expectEqual(@as(usize, 3), try early_stream.reader().read(&buf)); - testing.expectEqualSlices(u8, data[0..3], buf[0..3]); - testing.expectEqual(@as(usize, 0), try early_stream.reader().read(&buf)); - testing.expectError(error.EndOfStream, early_stream.reader().skipBytes(10, .{})); -} diff --git a/lib/std/io/limited_reader.zig b/lib/std/io/limited_reader.zig new file mode 100644 index 0000000000..734558b1e6 --- /dev/null +++ b/lib/std/io/limited_reader.zig @@ -0,0 +1,50 @@ +// SPDX-License-Identifier: MIT +// Copyright (c) 2015-2020 Zig Contributors +// This file is part of [zig](https://ziglang.org/), which is MIT licensed. +// The MIT license requires this copyright notice to be included in all copies +// and substantial portions of the software. +const std = @import("../std.zig"); +const io = std.io; +const assert = std.debug.assert; +const testing = std.testing; + +pub fn LimitedReader(comptime ReaderType: type) type { + return struct { + inner_reader: ReaderType, + bytes_left: u64, + + pub const Error = ReaderType.Error; + pub const Reader = io.Reader(*Self, Error, read); + + const Self = @This(); + + pub fn read(self: *Self, dest: []u8) Error!usize { + const max_read = std.math.min(self.bytes_left, dest.len); + const n = try self.inner_reader.read(dest[0..max_read]); + self.bytes_left -= n; + return n; + } + + pub fn reader(self: *Self) Reader { + return .{ .context = self }; + } + }; +} + +/// Returns an initialised `LimitedReader` +/// `bytes_left` is a `u64` to be able to take 64 bit file offsets +pub fn limitedReader(inner_reader: anytype, bytes_left: u64) LimitedReader(@TypeOf(inner_reader)) { + return .{ .inner_reader = inner_reader, .bytes_left = bytes_left }; +} + +test "basic usage" { + const data = "hello world"; + var fbs = std.io.fixedBufferStream(data); + var early_stream = limitedReader(fbs.reader(), 3); + + var buf: [5]u8 = undefined; + testing.expectEqual(@as(usize, 3), try early_stream.reader().read(&buf)); + testing.expectEqualSlices(u8, data[0..3], buf[0..3]); + testing.expectEqual(@as(usize, 0), try early_stream.reader().read(&buf)); + testing.expectError(error.EndOfStream, early_stream.reader().skipBytes(10, .{})); +} -- cgit v1.2.3