X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/c6a3fa2cdbf7eb78964a5df7622482cdd8782d74..e995052ef530b1eae2d0476ff519f7225bbb481d:/hotline/transfer.go diff --git a/hotline/transfer.go b/hotline/transfer.go index 4c80581..543b00c 100644 --- a/hotline/transfer.go +++ b/hotline/transfer.go @@ -37,12 +37,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,13 +51,14 @@ 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 } +// TODO: read the banner once on startup instead of once per banner fetch func (s *Server) bannerDownload(w io.Writer) error { bannerBytes, err := os.ReadFile(filepath.Join(s.ConfigDir, s.Config.BannerFile)) if err != nil {