std.fs.File: fix streaming seekBy ignoring buffer

streaming seekBy completely ignored the buffer. the new logic checks
if the seek offset is smaller than the buffer and adds the offset to
r.interface.seek. otherwise the old logic is invoked.

Author: rhizoome

lib/std/fs/File.zig

@@ -1198,22 +1198,28 @@ pub const Reader = struct {
                 }
                 const seek_err = r.seek_err orelse e: {
                     if (posix.lseek_CUR(r.file.handle, offset)) |_| {
-                        setPosAdjustingBuffer(r, @intCast(@as(i64, @intCast(r.pos)) + offset));
+                        setPosAdjustingBuffer(r, @intCast(@as(i64, @intCast(r.logicalPos())) + offset));
                         return;
                     } else |err| {
                         r.seek_err = err;
                         break :e err;
                     }
                 };
                 var remaining = std.math.cast(u64, offset) orelse return seek_err;
-                while (remaining > 0) {
-                    remaining -= discard(&r.interface, .limited64(remaining)) catch |err| {
-                        r.seek_err = err;
-                        return err;
-                    };
+                const bufferedLen = r.interface.bufferedLen();
+                if (remaining < bufferedLen) {
+                    r.interface.seek += remaining;
+                } else {
+                    remaining -= bufferedLen;
+                    while (remaining > 0) {
+                        remaining -= discard(&r.interface, .limited64(remaining)) catch |err| {
+                            r.seek_err = err;
+                            return err;
+                        };
+                    }
+                    r.interface.seek = 0;
+                    r.interface.end = 0;
                 }
-                r.interface.seek = 0;
-                r.interface.end = 0;
             },
             .failure => return r.seek_err.?,
         }

lib/std/fs/test.zig

@@ -2140,20 +2140,50 @@ test "seek keeping partial buffer" {
     try testing.expectEqualStrings("6789", &buf);
 }
 
+test "seekBy streaming edge case" {
+    var tmp_dir = testing.tmpDir(.{});
+    defer tmp_dir.cleanup();
+
+    try tmp_dir.dir.writeFile(.{ .sub_path = "blah.txt", .data = "let's test seekBy" });
+    const f = try tmp_dir.dir.openFile("blah.txt", .{ .mode = .read_only });
+    defer f.close();
+    var read_buf: [10]u8 = undefined;
+    var reader = f.readerStreaming(&read_buf);
+    var buffer: [20]u8 = undefined;
+    const n1 = try reader.interface.readSliceShort(buffer[0..2]);
+    try testing.expectEqual(2, n1);
+    try testing.expectEqualStrings("le", buffer[0..2]);
+    // edge case seek: exactly up to buffer size
+    try reader.seekBy(10);
+
+    const n2 = try reader.interface.readSliceShort(&buffer);
+    try testing.expectEqual(5, n2);
+    try testing.expectEqualStrings("eekBy", buffer[0..5]);
+}
+
 test "seekBy streaming" {
     var tmp_dir = testing.tmpDir(.{});
     defer tmp_dir.cleanup();
 
     try tmp_dir.dir.writeFile(.{ .sub_path = "blah.txt", .data = "let's test seekBy" });
     const f = try tmp_dir.dir.openFile("blah.txt", .{ .mode = .read_only });
     defer f.close();
-    var reader = f.readerStreaming(&.{});
+    var read_buf: [10]u8 = undefined;
+    var reader = f.readerStreaming(&read_buf);
+    var buffer: [20]u8 = undefined;
+    const n1 = try reader.interface.readSliceShort(buffer[0..2]);
+    try testing.expectEqual(2, n1);
+    try testing.expectEqualStrings("le", buffer[0..2]);
+    // seek within bufferedLen
     try reader.seekBy(2);
+    try reader.interface.readSliceAll(buffer[0..2]);
+    try testing.expectEqualStrings("s ", buffer[0..2]);
+    // seek past bufferedLen: causing discard
+    try reader.seekBy(12);
 
-    var buffer: [20]u8 = undefined;
-    const n = try reader.interface.readSliceShort(&buffer);
-    try testing.expectEqual(15, n);
-    try testing.expectEqualStrings("t's test seekBy", buffer[0..15]);
+    const n2 = try reader.interface.readSliceShort(&buffer);
+    try testing.expectEqual(1, n2);
+    try testing.expectEqualStrings("y", buffer[0..1]);
 }
 
 test "seekBy positional" {