fix: bypass errors on symbolic links

hacdias · hacdias · commit df453ca63491 · 2018-02-18T09:49:40.000Z
diff --git a/file.go b/file.go
@@ -134,13 +134,12 @@ func (i *File) GetListing(u *User, r *http.Request) error {
 		}
 
 		if strings.HasPrefix(f.Mode().String(), "L") {
-			// It's a symbolic link
-			// The FileInfo from Readdir treats symbolic link as a file only.
+			// It's a symbolic link. We try to follow it. If it doesn't work,
+			// we stay with the link information instead if the target's.
 			info, err := os.Stat(f.Name())
-			if err != nil {
-				return err
+			if err == nil {
+				f = info
 			}
-			f = info
 		}
 
 		if f.IsDir() {

Original file line number	Diff line number	Diff line change
`@@ -134,13 +134,12 @@ func (i File) GetListing(u User, r *http.Request) error {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`if strings.HasPrefix(f.Mode().String(), "L") {`
`137`		`- // It's a symbolic link`
`138`		`- // The FileInfo from Readdir treats symbolic link as a file only.`
	`137`	`+ // It's a symbolic link. We try to follow it. If it doesn't work,`
	`138`	`+ // we stay with the link information instead if the target's.`
`139`	`139`	`info, err := os.Stat(f.Name())`
`140`		`- if err != nil {`
`141`		`- return err`
	`140`	`+ if err == nil {`
	`141`	`+ f = info`
`142`	`142`	`}`
`143`		`- f = info`
`144`	`143`	`}`
`145`	`144`
`146`	`145`	`if f.IsDir() {`