X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/df1ade5433b027f9cb905e584921692313e647f5..71f9ce10c4d0ebc0d5aec5a2bf46b1c508409338:/hotline/transfer.go?ds=inline

diff --git a/hotline/transfer.go b/hotline/transfer.go
index 4c80581..5cb28c8 100644
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -5,13 +5,11 @@ import (
 	"encoding/binary"
 	"errors"
 	"io"
-	"os"
-	"path/filepath"
 )
 
 type transfer struct {
 	Protocol        [4]byte // "HTXF" 0x48545846
-	ReferenceNumber [4]byte // Unique ID generated for the transfer
+	ReferenceNumber [4]byte // Unique Type generated for the transfer
 	DataSize        [4]byte // File size
 	RSVD            [4]byte // Not implemented in Hotline Protocol
 }
@@ -37,12 +35,12 @@ func receiveFile(r io.Reader, targetFile, resForkFile, infoFork, counterWriter i
 	}
 
 	// Write the information fork
-	_, err := infoFork.Write(ffo.FlatFileInformationFork.MarshalBinary())
+	_, err := io.Copy(infoFork, &ffo.FlatFileInformationFork)
 	if err != nil {
 		return err
 	}
 
-	if _, err = io.Copy(targetFile, io.TeeReader(r, counterWriter)); err != nil {
+	if _, err = io.CopyN(targetFile, io.TeeReader(r, counterWriter), ffo.dataSize()); err != nil {
 		return err
 	}
 
@@ -51,19 +49,9 @@ func receiveFile(r io.Reader, targetFile, resForkFile, infoFork, counterWriter i
 			return err
 		}
 
-		if _, err = io.Copy(resForkFile, io.TeeReader(r, counterWriter)); err != nil {
+		if _, err = io.CopyN(resForkFile, io.TeeReader(r, counterWriter), ffo.rsrcSize()); err != nil {
 			return err
 		}
 	}
 	return nil
 }
-
-func (s *Server) bannerDownload(w io.Writer) error {
-	bannerBytes, err := os.ReadFile(filepath.Join(s.ConfigDir, s.Config.BannerFile))
-	if err != nil {
-		return err
-	}
-	_, err = w.Write(bannerBytes)
-
-	return err
-}