From: Jeff Halter <redacted>
Date: Mon, 17 Jun 2024 18:40:34 +0000 (-0700)
Subject: Fix io.Reader implementation for FileNameWithInfo
X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/commitdiff_plain/1a37f0144d0fd777771c6d870e3c3298947e2712

Fix io.Reader implementation for FileNameWithInfo
---

diff --git a/hotline/file_name_with_info.go b/hotline/file_name_with_info.go
index 4d59dd0..3324a62 100644
--- a/hotline/file_name_with_info.go
+++ b/hotline/file_name_with_info.go
@@ -10,6 +10,8 @@ import (
 type FileNameWithInfo struct {
 	fileNameWithInfoHeader
 	Name []byte // File Name
+
+	readOffset int // Internal offset to track read progress
 }
 
 // fileNameWithInfoHeader contains the fixed length fields of FileNameWithInfo
@@ -27,18 +29,25 @@ func (f *fileNameWithInfoHeader) nameLen() int {
 }
 
 // Read implements io.Reader for FileNameWithInfo
-func (f *FileNameWithInfo) Read(b []byte) (int, error) {
-	return copy(b,
-		slices.Concat(
-			f.Type[:],
-			f.Creator[:],
-			f.FileSize[:],
-			f.RSVD[:],
-			f.NameScript[:],
-			f.NameSize[:],
-			f.Name,
-		),
-	), io.EOF
+func (f *FileNameWithInfo) Read(p []byte) (int, error) {
+	buf := slices.Concat(
+		f.Type[:],
+		f.Creator[:],
+		f.FileSize[:],
+		f.RSVD[:],
+		f.NameScript[:],
+		f.NameSize[:],
+		f.Name,
+	)
+
+	if f.readOffset >= len(buf) {
+		return 0, io.EOF // All bytes have been read
+	}
+
+	n := copy(p, buf[f.readOffset:])
+	f.readOffset += n
+
+	return n, nil
 }
 
 func (f *FileNameWithInfo) Write(p []byte) (int, error) {