fix path evaluation with symlinks

mandelsoft · Sep 9, 2020 · 2adb287 · 2adb287
1 parent 531655b
commit 2adb287
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/mandelsoft/vfs
 go 1.13
 
 require (
-	github.com/mandelsoft/filepath v0.0.0-20200908104906-2d4df9739918
+	github.com/mandelsoft/filepath v0.0.0-20200909114706-3df73d378d55
 	github.com/onsi/ginkgo v1.14.0
 	github.com/onsi/gomega v1.10.1
 	gopkg.in/yaml.v2 v2.3.0

diff --git a/go.sum b/go.sum
@@ -24,6 +24,8 @@ github.com/mandelsoft/filepath v0.0.0-20200906144341-f6f7308759ed h1:yu9MpVjXEvf
 github.com/mandelsoft/filepath v0.0.0-20200906144341-f6f7308759ed/go.mod h1:n4xEiUD2HNHnn2w5ZKF0qgjDecHVCWAl5DxZ7+pcFU8=
 github.com/mandelsoft/filepath v0.0.0-20200908104906-2d4df9739918 h1:bK6zU2n99z3vZo4gKOiUs5sG4sLCkYEetGVmPphv8k0=
 github.com/mandelsoft/filepath v0.0.0-20200908104906-2d4df9739918/go.mod h1:n4xEiUD2HNHnn2w5ZKF0qgjDecHVCWAl5DxZ7+pcFU8=
+github.com/mandelsoft/filepath v0.0.0-20200909114706-3df73d378d55 h1:mFdiUG86O2iW+iDEpZKXf64efMWO4JvDT+zN3znUGIc=
+github.com/mandelsoft/filepath v0.0.0-20200909114706-3df73d378d55/go.mod h1:n4xEiUD2HNHnn2w5ZKF0qgjDecHVCWAl5DxZ7+pcFU8=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

diff --git a/pkg/vfs/eval.go b/pkg/vfs/eval.go
@@ -87,7 +87,7 @@ outer:
 					parsed = next
 					continue
 				}
-				link, err := fs.Readlink(next)
+				link, err := fs.Readlink(p)
 				if err != nil {
 					return "", NewPathError("", next, err)
 				}

diff --git a/vendor/github.com/mandelsoft/filepath/pkg/filepath/eval.go b/vendor/github.com/mandelsoft/filepath/pkg/filepath/eval.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1,6 +1,6 @@
 # github.com/fsnotify/fsnotify v1.4.9
 github.com/fsnotify/fsnotify
-# github.com/mandelsoft/filepath v0.0.0-20200908104906-2d4df9739918
+# github.com/mandelsoft/filepath v0.0.0-20200909114706-3df73d378d55
 github.com/mandelsoft/filepath/pkg/filepath
 # github.com/nxadm/tail v1.4.4
 github.com/nxadm/tail