the same for wsInterrupted

nim-lang · Feb 4, 2020 · 5b554d8 · 5b554d8
1 parent 2abbecb
commit 5b554d8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/pure/os.nim b/lib/pure/os.nim
@@ -2177,6 +2177,7 @@ iterator tryWalkDir*(dir: string, relative=false): WalkStep {.
 
   var step: WalkStep
   var skip = false
+  let outDir = if relative: "." else: dir
   proc sOpenDir(s: OpenDirStatus, path: string): WalkStep =
     let code = if s == odOpenOk: OSErrorCode(0) else: osLastError()
     result = WalkStep(kind: wsOpenDir, openStatus: s, code: code, path: path)
@@ -2209,7 +2210,7 @@ iterator tryWalkDir*(dir: string, relative=false): WalkStep {.
         of ERROR_ACCESS_DENIED: odAccessDenied
         else: odUnknownError
       else: odOpenOk
-    step = sOpenDir(status, if relative: "." else: dir)
+    step = sOpenDir(status, outDir)
 
     var firstStep = true
     while true:
@@ -2226,7 +2227,7 @@ iterator tryWalkDir*(dir: string, relative=false): WalkStep {.
             break  # normal end, yielding nothing
           else:
             skip = false
-            step = sGetError(wsInterrupted, dir)
+            step = sGetError(wsInterrupted, outDir)
             continue
       skip = skipFindData(f)
       if not skip:
@@ -2280,7 +2281,7 @@ iterator tryWalkDir*(dir: string, relative=false): WalkStep {.
           elif errno == EACCES: odAccessDenied
           else: odUnknownError
       else: odOpenOk
-    step = sOpenDir(status, if relative: "." else: dir)
+    step = sOpenDir(status, outDir)
 
     while true:
       if not skip:
@@ -2296,7 +2297,7 @@ iterator tryWalkDir*(dir: string, relative=false): WalkStep {.
           break  # normal end, yielding nothing
         else:
           skip = false
-          step = sGetError(wsInterrupted, dir)
+          step = sGetError(wsInterrupted, outDir)
           continue
       when defined(nimNoArrayToCstringConversion):
         var y = $cstring(addr x.d_name)