mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-11 02:59:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Dont break loop on dir read error

Browse Source
This commit is contained in:
Kovid Goyal
2025-06-25 08:54:11 +05:30
parent 0ec6dc4ef8
commit d70afc285c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kittens/choose_files/scan.go
View File

@@ -195,6 +195,7 @@ func (fss *FileSystemScanner) worker() {
}
}()
seen_dirs := make(map[string]bool)
symlink_dir_map := make(map[string]string)
root_dir, _ := filepath.Abs(fss.root_dir)
dir := root_dir + string(os.PathSeparator)
base := ""
@@ -211,13 +212,13 @@ func (fss *FileSystemScanner) worker() {
seen_dirs[dir] = true
entries, err := fss.dir_reader(dir)
if err != nil {
if dir == root_dir {
if len(seen_dirs) == 1 {
fss.keep_going.Store(false)
fss.mutex.Lock()
fss.err = err
fss.mutex.Unlock()
}
break
entries = nil
}
if cap(arena) < len(entries) {
arena = make([]sortable_dir_entry, 0, max(1024, len(entries), 2*cap(arena)))
@@ -229,8 +230,9 @@ func (fss *FileSystemScanner) worker() {
arena[i].name = e.Name()
ftype := e.Type()
if ftype&fs.ModeSymlink != 0 {
if st, err := os.Stat(dir + arena[i].name); err == nil && st.IsDir() {
if st, serr := os.Stat(dir + arena[i].name); serr == nil && st.IsDir() {
ftype = fs.ModeDir | 1 // 1 indicates was originally a symlink
symlink_dir_map[dir+arena[i].name] = st.Name()
}
}
arena[i].ftype = ftype