From 386232f39ede046d6453a0990ad40f2d86a26f53 Mon Sep 17 00:00:00 2001
From: copilot-swe-agent[bot]
Date: Mon, 7 Jul 2025 18:18:12 +0000
Subject: Fix all staticcheck errors in gocryptfs codebase

Co-authored-by: rfjakob <286847+rfjakob@users.noreply.github.com>

Add staticcheck to test.bash for continuous static analysis

Co-authored-by: rfjakob <286847+rfjakob@users.noreply.github.com>

Fix nil pointer dereference in timesToTimespec function

The previous fix for deprecated fuse.UtimeToTimespec caused a panic
because unix.TimeToTimespec doesn't handle nil pointers. This fix
properly handles nil pointers by using unix.UTIME_OMIT while still
using the non-deprecated unix.TimeToTimespec function.

Co-authored-by: rfjakob <286847+rfjakob@users.noreply.github.com>

Undo SA6002 changes and add staticcheck ignore directive instead

Co-authored-by: rfjakob <286847+rfjakob@users.noreply.github.com>
---
 tests/reverse/exclude_test.go         | 4 +---
 tests/reverse/inomap_test.go          | 4 ++--
 tests/reverse/one_file_system_test.go | 9 ++++++---
 tests/reverse/xattr_test.go           | 5 +----
 tests/test_helpers/mount_unmount.go   | 2 +-
 tests/xattr/xattr_integration_test.go | 5 +----
 6 files changed, 12 insertions(+), 17 deletions(-)

(limited to 'tests')

diff --git a/tests/reverse/exclude_test.go b/tests/reverse/exclude_test.go
index 45d097b..645d267 100644
--- a/tests/reverse/exclude_test.go
+++ b/tests/reverse/exclude_test.go
@@ -42,9 +42,7 @@ func doTestExcludeTestFs(t *testing.T, flag string, patterns []string, tree dire
 		if test_helpers.VerifyExistence(t, mnt+"/"+v) {
 			t.Errorf("File %q is visible, but should be hidden", v)
 		}
-		if nametransform.IsLongContent(filepath.Base(v)) {
-			// TODO ???
-		}
+
 	}
 	for _, v := range cVisible {
 		if !test_helpers.VerifyExistence(t, mnt+"/"+v) {
diff --git a/tests/reverse/inomap_test.go b/tests/reverse/inomap_test.go
index ff78f4c..fadf6a5 100644
--- a/tests/reverse/inomap_test.go
+++ b/tests/reverse/inomap_test.go
@@ -85,7 +85,7 @@ func TestVirtualFileIno(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	dirents, err := fd.Readdirnames(0)
+	_, err = fd.Readdirnames(0)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -104,7 +104,7 @@ func TestVirtualFileIno(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	dirents, err = fd.Readdirnames(0)
+	dirents, err := fd.Readdirnames(0)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tests/reverse/one_file_system_test.go b/tests/reverse/one_file_system_test.go
index 5bc965f..823cf62 100644
--- a/tests/reverse/one_file_system_test.go
+++ b/tests/reverse/one_file_system_test.go
@@ -1,7 +1,6 @@
 package reverse_test
 
 import (
-	"io/ioutil"
 	"net/url"
 	"os"
 	"runtime"
@@ -33,7 +32,7 @@ func TestOneFileSystem(t *testing.T) {
 	// Copied from inomap
 	const maxPassthruIno = 1<<48 - 1
 
-	entries, err := ioutil.ReadDir(mnt)
+	entries, err := os.ReadDir(mnt)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -43,7 +42,11 @@ func TestOneFileSystem(t *testing.T) {
 			// We are only interested in directories
 			continue
 		}
-		st := e.Sys().(*syscall.Stat_t)
+		info, err := e.Info()
+		if err != nil {
+			continue
+		}
+		st := info.Sys().(*syscall.Stat_t)
 		// The inode numbers of files with a different device number are remapped
 		// to something above maxPassthruIno
 		if st.Ino > maxPassthruIno {
diff --git a/tests/reverse/xattr_test.go b/tests/reverse/xattr_test.go
index a459808..c70f623 100644
--- a/tests/reverse/xattr_test.go
+++ b/tests/reverse/xattr_test.go
@@ -16,10 +16,7 @@ func xattrSupported(path string) bool {
 		return true
 	}
 	err2 := err.(*xattr.Error)
-	if err2.Err == syscall.EOPNOTSUPP {
-		return false
-	}
-	return true
+	return err2.Err != syscall.EOPNOTSUPP
 }
 
 func TestXattrList(t *testing.T) {
diff --git a/tests/test_helpers/mount_unmount.go b/tests/test_helpers/mount_unmount.go
index 46c64c9..4abc432 100644
--- a/tests/test_helpers/mount_unmount.go
+++ b/tests/test_helpers/mount_unmount.go
@@ -187,7 +187,7 @@ func UnmountErr(dir string) (err error) {
 		err = cmd.Run()
 		if err == nil {
 			if len(fdsNow) > len(fds)+maxCacheFds {
-				return fmt.Errorf("fd leak in gocryptfs process? pid=%d dir=%q, fds:\nold=%v \nnew=%v\n", pid, dir, fds, fdsNow)
+				return fmt.Errorf("fd leak in gocryptfs process? pid=%d dir=%q, fds:\nold=%v \nnew=%v", pid, dir, fds, fdsNow)
 			}
 			return nil
 		}
diff --git a/tests/xattr/xattr_integration_test.go b/tests/xattr/xattr_integration_test.go
index 1a5d540..e662828 100644
--- a/tests/xattr/xattr_integration_test.go
+++ b/tests/xattr/xattr_integration_test.go
@@ -217,10 +217,7 @@ func xattrSupported(path string) bool {
 		return true
 	}
 	err2 := err.(*xattr.Error)
-	if err2.Err == syscall.EOPNOTSUPP {
-		return false
-	}
-	return true
+	return err2.Err != syscall.EOPNOTSUPP
 }
 
 func TestBase64XattrRead(t *testing.T) {
-- 
cgit v1.2.3