various changes

fclairamb · Mar 3, 2024 · f018bb5 · f018bb5
1 parent fb67573
commit f018bb5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -175,8 +175,12 @@ linters:
         - dogsled
         - dupl
         - dupword
+        - durationcheck
         - errcheck
         - exhaustive
+        - errchkjson
+        - errname
+        - errorlint
         # - exhaustivestruct
         - exportloopref
         - funlen

diff --git a/client_handler.go b/client_handler.go
@@ -485,7 +485,7 @@ func (c *clientHandler) handleCommandsStreamError(err error) {
 
 		c.logger.Error("Network error", "err", err)
 	default:
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			if c.debug {
 				c.logger.Debug("Client disconnected", "clean", false)
 			}

diff --git a/driver_test.go b/driver_test.go
@@ -101,7 +101,7 @@ func NewTestServerWithDriverAndLogger(t *testing.T, driver MainDriver, logger lo
 	})
 
 	go func() {
-		if err := s.Serve(); err != nil && err != io.EOF {
+		if err := s.Serve(); err != nil && errors.Is(err, io.EOF) {
 			s.Logger.Error("problem serving", "err", err)
 		}
 	}()

diff --git a/handle_dirs.go b/handle_dirs.go
@@ -188,7 +188,7 @@ func (c *clientHandler) checkLISTArgs(args string) string {
 func (c *clientHandler) handleLIST(param string) error {
 	info := fmt.Sprintf("LIST %v", param)
 
-	if files, _, err := c.getFileList(param, true); err == nil || err == io.EOF {
+	if files, _, err := c.getFileList(param, true); err == nil || errors.Is(err, io.EOF) {
 		if tr, errTr := c.TransferOpen(info); errTr == nil {
 			err = c.dirTransferLIST(tr, files)
 			c.TransferClose(err)
@@ -207,7 +207,7 @@ func (c *clientHandler) handleLIST(param string) error {
 func (c *clientHandler) handleNLST(param string) error {
 	info := fmt.Sprintf("NLST %v", param)
 
-	if files, parentDir, err := c.getFileList(param, true); err == nil || err == io.EOF {
+	if files, parentDir, err := c.getFileList(param, true); err == nil || errors.Is(err, io.EOF) {
 		if tr, errTrOpen := c.TransferOpen(info); errTrOpen == nil {
 			err = c.dirTransferNLST(tr, files, parentDir)
 			c.TransferClose(err)