Account for the root

[rbdr/mobius] / hotline / transfer.go

diff --git a/hotline/transfer.go b/hotline/transfer.go
index 9d2a97f732afc80bcad3997f6f88023d0256c114..53dd356a24440133c909f433b1d907f66a3faaec 100644 (file)
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -1,18 +1,16 @@
 package hotline
 
 import (
-       "bufio"
        "bytes"
        "encoding/binary"
        "errors"
+       "fmt"
        "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
 }
@@ -31,81 +29,30 @@ func (tf *transfer) Write(b []byte) (int, error) {
        return len(b), nil
 }
 
-const fileCopyBufSize = 4096
-
-func receiveFile(r io.Reader, targetFile, resForkFile, infoFork io.Writer) error {
+func receiveFile(r io.Reader, targetFile, resForkFile, infoFork, counterWriter io.Writer) error {
        var ffo flattenedFileObject
        if _, err := ffo.ReadFrom(r); err != nil {
-               return err
+               return fmt.Errorf("read flatted file object: %v", err)
        }
 
        // Write the information fork
-       _, err := infoFork.Write(ffo.FlatFileInformationFork.MarshalBinary())
+       _, err := io.Copy(infoFork, &ffo.FlatFileInformationFork)
        if err != nil {
-               return err
+               return fmt.Errorf("write the information fork: %v", err)
        }
 
-       // read and write the data fork
-       bw := bufio.NewWriterSize(targetFile, fileCopyBufSize)
-       if _, err = io.CopyN(bw, r, ffo.dataSize()); err != nil {
-               return err
-       }
-       if err := bw.Flush(); err != nil {
-               return err
+       if _, err = io.CopyN(targetFile, io.TeeReader(r, counterWriter), ffo.dataSize()); err != nil {
+               return fmt.Errorf("copy file data to partial file: %v", err)
        }
 
        if ffo.FlatFileHeader.ForkCount == [2]byte{0, 3} {
                if err := binary.Read(r, binary.BigEndian, &ffo.FlatFileResForkHeader); err != nil {
-                       return err
+                       return fmt.Errorf("read resource fork header: %v", err)
                }
 
-               bw = bufio.NewWriterSize(resForkFile, fileCopyBufSize)
-               _, err = io.CopyN(resForkFile, r, ffo.rsrcSize())
-               if err != nil {
-                       return err
-               }
-               if err := bw.Flush(); err != nil {
-                       return err
+               if _, err = io.CopyN(resForkFile, io.TeeReader(r, counterWriter), ffo.rsrcSize()); err != nil {
+                       return fmt.Errorf("read resource fork: %v", err)
                }
        }
        return nil
 }
-
-func sendFile(w io.Writer, r io.Reader, offset int) (err error) {
-       br := bufio.NewReader(r)
-       if _, err := br.Discard(offset); err != nil {
-               return err
-       }
-
-       rSendBuffer := make([]byte, 1024)
-       for {
-               var bytesRead int
-
-               if bytesRead, err = br.Read(rSendBuffer); err == io.EOF {
-                       if _, err := w.Write(rSendBuffer[:bytesRead]); err != nil {
-                               return err
-                       }
-                       return nil
-               }
-               if err != nil {
-                       return err
-               }
-               // totalSent += int64(bytesRead)
-
-               // fileTransfer.BytesSent += bytesRead
-
-               if _, err := w.Write(rSendBuffer[:bytesRead]); err != nil {
-                       return err
-               }
-       }
-}
-
-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
-}