accommodate change requests:

* use filepath.EvalSymlinks
* resolve only symlinks of the parent
* update trashdir_test

Author: kmarius

go.mod

@@ -17,7 +17,6 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
 	github.com/umlx5h/go-runewidth v0.0.0-20240106112317-9bbbb3702d5f
-	github.com/yookoala/realpath v1.0.0
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
 	golang.org/x/term v0.21.0
 )

go.sum

@@ -89,8 +89,6 @@ github.com/umlx5h/go-runewidth v0.0.0-20240106112317-9bbbb3702d5f h1:T8MNFeOIelX
 github.com/umlx5h/go-runewidth v0.0.0-20240106112317-9bbbb3702d5f/go.mod h1:+aP7JKaGs4irGEvKbEMTjKb1uKLoRZKMrrUwdGzajsk=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
-github.com/yookoala/realpath v1.0.0 h1:7OA9pj4FZd+oZDsyvXWQvjn5oBdcHRTV44PpdMSuImQ=
-github.com/yookoala/realpath v1.0.0/go.mod h1:gJJMA9wuX7AcqLy1+ffPatSCySA1FQ2S8Ya9AIoYBpE=
 golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
 golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=

internal/xdg/trashdir.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/moby/sys/mountinfo"
 	"github.com/umlx5h/gtrash/internal/env"
-	"github.com/yookoala/realpath"
 )
 
 type trashDirType string
@@ -240,15 +239,15 @@ func getAllMountpoints() ([]string, error) {
 }
 
 var mountinfo_Mounted = mountinfo.Mounted
-var realpath_Realpath = realpath.Realpath
+var EvalSymLinks = filepath.EvalSymlinks
 
 // Obtain a mount point associated with a file.
 // Same as df <PATH>
 func getMountpoint(path string) (string, error) {
 
-	// iterate over the parents of the real (without symlinks) path until we find a mount point
+	// iterate over the real (without symlinks) parents of path until we find a mount point
 
-	candidate, err := realpath_Realpath(path)
+	candidate, err := EvalSymLinks(filepath.Dir(path))
 	if err != nil {
 		return "", err
 	}
@@ -266,7 +265,12 @@ func getMountpoint(path string) (string, error) {
 			return "", errors.New("mountpoint is '.'")
 		}
 
-		if mounted, err := mountinfo_Mounted(candidate); err == nil && mounted {
+		mounted, err := mountinfo_Mounted(candidate)
+		if err != nil {
+			return "", err
+		}
+
+		if mounted {
 			break
 		}
 

internal/xdg/trashdir_test.go

@@ -20,7 +20,19 @@ func TestGetMountpoint(t *testing.T) {
 		return slices.Contains(mounts, fpath), nil
 	}
 
-	realpath_Realpath = func(path string) (string, error) {
+	// not evaluating each component here, just the entire path
+	symlinked := map[string]string{
+		// file is a link
+		"/foo/link.txt": "/foo/bar/target.txt",
+
+		// first component is a link
+		"/link": "/foo/bar",
+	}
+
+	EvalSymLinks = func(path string) (string, error) {
+		if symlink, ok := symlinked[path]; ok {
+			return symlink, nil
+		}
 		return path, nil
 	}
 
@@ -34,6 +46,9 @@ func TestGetMountpoint(t *testing.T) {
 		{path: "/ffoo/bar/a.txt", want: "/ffoo/bar"},
 		{path: "/aaa/bbb/ccc/ddd.txt", want: "/"},
 		{path: "/", want: "/"},
+
+		{path: "/foo/link.txt", want: "/foo"},
+		{path: "/link/a.txt", want: "/foo/bar"},
 	}
 
 	t.Run("normal", func(t *testing.T) {