X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/5cc444c89968dda9060d4e2f458b1babb9b603cd..refs/heads/main:/hotline/transfer.go?ds=inline diff --git a/hotline/transfer.go b/hotline/transfer.go index 1257f8a..53dd356 100644 --- a/hotline/transfer.go +++ b/hotline/transfer.go @@ -4,12 +4,13 @@ import ( "bytes" "encoding/binary" "errors" + "fmt" "io" ) 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,26 +32,26 @@ func (tf *transfer) Write(b []byte) (int, 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 := io.Copy(infoFork, &ffo.FlatFileInformationFork) if err != nil { - return err + return fmt.Errorf("write the information fork: %v", err) } if _, err = io.CopyN(targetFile, io.TeeReader(r, counterWriter), ffo.dataSize()); err != nil { - return err + 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) } if _, err = io.CopyN(resForkFile, io.TeeReader(r, counterWriter), ffo.rsrcSize()); err != nil { - return err + return fmt.Errorf("read resource fork: %v", err) } } return nil