Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2024-11-24 21:57:36 +00:00
Code Issues Projects Releases Wiki Activity

--walker-skip should also handle symlinks to directories

Browse Source 
Fix #3858
This commit is contained in:
Junegunn Choi 2024-06-13 22:54:13 +09:00
parent 0acace1ace
commit 9dc3ed638a
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/reader.go
View File

@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"context" "context"
"io" "io"
"io/fs"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@ -222,6 +223,16 @@ func (r *Reader) readFromStdin() bool {
return true return true
} }
func isSymlinkToDir(path string, de os.DirEntry) bool {
if de.Type()&fs.ModeSymlink == 0 {
return false
}
if s, err := os.Stat(path); err == nil {
return s.IsDir()
}
return false
}
func (r *Reader) readFiles(root string, opts walkerOpts, ignores []string) bool { func (r *Reader) readFiles(root string, opts walkerOpts, ignores []string) bool {
r.killed = false r.killed = false
conf := fastwalk.Config{Follow: opts.follow} conf := fastwalk.Config{Follow: opts.follow}
@ -232,7 +243,7 @@ func (r *Reader) readFiles(root string, opts walkerOpts, ignores []string) bool
path = filepath.Clean(path) path = filepath.Clean(path)
if path != "." { if path != "." {
isDir := de.IsDir() isDir := de.IsDir()
if isDir { if isDir || opts.follow && isSymlinkToDir(path, de) {
base := filepath.Base(path) base := filepath.Base(path)
if !opts.hidden && base[0] == '.' { if !opts.hidden && base[0] == '.' {
return filepath.SkipDir return filepath.SkipDir