X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/d9bc63a10d0978d9a5222cf7be74044e55f409b7..e59041902fbc6fb62b5c9ff8e9b4849d4bf853ea:/hotline/transfer.go diff --git a/hotline/transfer.go b/hotline/transfer.go index 5cb28c8..53dd356 100644 --- a/hotline/transfer.go +++ b/hotline/transfer.go @@ -4,6 +4,7 @@ import ( "bytes" "encoding/binary" "errors" + "fmt" "io" ) @@ -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