Skip to content

fix some error checks #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 2, 2024
Merged

fix some error checks #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2fd0ae7
fix some error checks
drakkan May 10, 2024
1c6a054
Merge branch 'main' into fixerr
fclairamb May 29, 2024
047cea4
Merge branch 'main' into fixerr
fclairamb May 29, 2024
d04488b
Merge branch 'main' into fixerr
fclairamb May 29, 2024
9ab5453
Merge branch 'main' into fixerr
fclairamb Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion driver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func NewTestServerWithDriverAndLogger(t *testing.T, driver MainDriver, logger lo
})

go func() {
if err := server.Serve(); err != nil && errors.Is(err, io.EOF) {
if err := server.Serve(); err != nil && !errors.Is(err, io.EOF) {
server.Logger.Error("problem serving", "err", err)
}
}()
Expand Down
4 changes: 2 additions & 2 deletions handle_files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func (c *clientHandler) doFileTransfer(transferConn net.Conn, file io.ReadWriter
}

// for reads io.EOF isn't an error, for writes it must be considered an error
if written, errCopy := io.Copy(writer, reader); errCopy != nil && (errors.Is(errCopy, io.EOF) || write) {
if written, errCopy := io.Copy(writer, reader); errCopy != nil && (!errors.Is(errCopy, io.EOF) || write) {
err = errCopy
} else {
c.logger.Debug(
Expand Down Expand Up @@ -704,7 +704,7 @@ func (c *clientHandler) computeHashForFile(filePath string, algo HASHAlgo, start

_, err = io.CopyN(chosenHashAlgo, file, end-start)

if err != nil && errors.Is(err, io.EOF) {
if err != nil && !errors.Is(err, io.EOF) {
return "", newFileAccessError("couldn't read file", err)
}

Expand Down