mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-06-06 11:54:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fix to Posix part of walkDir (#16234)

Browse Source 
* change break->continue and rewrite one-yield-style

* use case statement for clarity

* Tiny nit

Co-authored-by: Clyybber <darkmine956@gmail.com>
This commit is contained in:
Andrey Makarov
2020-12-03 19:09:54 +03:00
committed by GitHub
parent c731f7ab14
commit e223a05123
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/pure/os.nim
View File

@@ -2120,21 +2120,27 @@ iterator walkDir*(dir: string; relative = false, checkDir = false):
y = path
var k = pcFile
template kSetGeneric() = # pure Posix component `k` resolution
if lstat(path, s) < 0'i32: continue # don't yield
elif S_ISDIR(s.st_mode):
k = pcDir
elif S_ISLNK(s.st_mode):
k = getSymlinkFileKind(path)
when defined(linux) or defined(macosx) or
defined(bsd) or defined(genode) or defined(nintendoswitch):
if x.d_type != DT_UNKNOWN:
if x.d_type == DT_DIR: k = pcDir
if x.d_type == DT_LNK:
if dirExists(path): k = pcLinkToDir
else: k = pcLinkToFile
yield (k, y)
continue
case x.d_type
of DT_DIR: k = pcDir
of DT_LNK:
if dirExists(path): k = pcLinkToDir
else: k = pcLinkToFile
of DT_UNKNOWN:
kSetGeneric()
else: # e.g. DT_REG etc
discard # leave it as pcFile
else: # assuming that field `d_type` is not present
kSetGeneric()
if lstat(path, s) < 0'i32: break
if S_ISDIR(s.st_mode):
k = pcDir
elif S_ISLNK(s.st_mode):
k = getSymlinkFileKind(path)
yield (k, y)
iterator walkDirRec*(dir: string,