Remove unreachable block in fs path cleanup

dmcgowan · dmcgowan · commit 18a1c09ebb86 · 2018-09-20T14:35:55.000-07:00
The block checking for the root as a prefix of an absolute
link is unnecessary since the end path always gets joined
with the root. In the case where the symlink path is prefixed
with the root, this should be considered coincidental and the
unit tests already show that the root gets correctly applied
to absolute links. Additionally inside this block there is a
bug causing in incorrect truncation of the path which would
only manifest itself in this rare coincidental case.

Signed-off-by: Derek McGowan &lt;derek@mcgstyle.net&gt;
diff --git a/fs/path.go b/fs/path.go
@@ -248,12 +248,6 @@ func walkLink(root, path string, linksWalked *int) (newpath string, islink bool,
 	if err != nil {
 		return "", false, err
 	}
-	if filepath.IsAbs(newpath) && strings.HasPrefix(newpath, root) {
-		newpath = newpath[:len(root)]
-		if !strings.HasPrefix(newpath, "/") {
-			newpath = "/" + newpath
-		}
-	}
 	*linksWalked++
 	return newpath, true, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -248,12 +248,6 @@ func walkLink(root, path string, linksWalked *int) (newpath string, islink bool,`
`248`	`248`	`if err != nil {`
`249`	`249`	`return "", false, err`
`250`	`250`	`}`
`251`		`- if filepath.IsAbs(newpath) && strings.HasPrefix(newpath, root) {`
`252`		`- newpath = newpath[:len(root)]`
`253`		`- if !strings.HasPrefix(newpath, "/") {`
`254`		`- newpath = "/" + newpath`
`255`		`- }`
`256`		`- }`
`257`	`251`	`*linksWalked++`
`258`	`252`	`return newpath, true, nil`
`259`	`253`	`}`