Merge branch 'main' into feat/mode-support

fclairamb · Jun 2, 2024 · 3880fc0 · 3880fc0
2 parents fb455b1 + d2b3c25
commit 3880fc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/driver_test.go b/driver_test.go
@@ -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)
 		}
 	}()

diff --git a/handle_files.go b/handle_files.go
@@ -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(
@@ -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)
 	}