zig

commit 8695b9fbe781ea030bafb4f6272202b9115ba46b (tree)
parent 0ab8ae944cd2b48c783c4ca8963997b6af207d5e
Author: daurnimator <quae@daurnimator.com>
Date:   Thu, 19 Nov 2020 02:10:14 +1100

std: use reader.skipBytes to avoid infinite loop in writeFileAllUnseekable

skipBytes correctly handles EOF for us

Diffstat:
M
lib/std/fs/file.zig
 | 
13
+++----------

1 file changed, 3 insertions(+), 10 deletions(-)
diff --git 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) {