Merge pull request #134 from dmcgowan/remove-unnecessary-fs-root-check

estesp · web-flow · commit 7f53d412b9eb · 2018-09-21T12:10:01.000-04:00
Remove unreachable block in fs path cleanup
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`	`}`