summary refs log tree commit diff stats
path: root/lib/pure
diff options
context:
space:
mode:
authoroskca <datago@yeah.net>2018-01-11 13:40:25 +0800
committeroskca <datago@yeah.net>2018-01-11 13:40:35 +0800
commit495331bf20d5c3147290f0393581c4bd7292c89c (patch)
tree301875ad665e41d31ded9d6afcd25f5e97af1f9f /lib/pure
parente98a2051ce22c1f72c662e0c3e37597cbfaad6b0 (diff)
downloadNim-495331bf20d5c3147290f0393581c4bd7292c89c.tar.gz
raiseOSError to indicate the failling of findNextFile in walkDir[Rec]
Diffstat (limited to 'lib/pure')
-rw-r--r--lib/pure/os.nim10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/pure/os.nim b/lib/pure/os.nim
index 689fc8d4a..1e3224537 100644
--- a/lib/pure/os.nim
+++ b/lib/pure/os.nim
@@ -672,7 +672,10 @@ template walkCommon(pattern: string, filter) =
           if dotPos < 0 or idx >= ff.len or ff[idx] == '.' or
               pattern[dotPos+1] == '*':
             yield splitFile(pattern).dir / extractFilename(ff)
-        if findNextFile(res, f) == 0'i32 and getLastError() == 18: break # ERROR_NO_MORE_FILES=18
+        if findNextFile(res, f) == 0'i32:
+          let errCode = getLastError()
+          if errCode == ERROR_NO_MORE_FILES: break
+          else: raiseOSError(errCode, "findNextFile failed")
   else: # here we use glob
     var
       f: Glob
@@ -782,7 +785,10 @@ iterator walkDir*(dir: string; relative=false): tuple[kind: PathComponent, path:
             let xx = if relative: extractFilename(getFilename(f))
                      else: dir / extractFilename(getFilename(f))
             yield (k, xx)
-          if findNextFile(h, f) == 0'i32 and getLastError() == 18: break # ERROR_NO_MORE_FILES=18
+          if findNextFile(res, f) == 0'i32:
+            let errCode = getLastError()
+            if errCode == ERROR_NO_MORE_FILES: break
+            else: raiseOSError(errCode, "findNextFile failed")
     else:
       var d = opendir(dir)
       if d != nil:
mp;id=7343aa0e9dd9aa7602ac504c601affe8d18c5fd1'>7343aa0e9 ^
7e0da3e8f ^
4d4b3b1c0 ^
7343aa0e9 ^
7e0da3e8f ^
4d4b3b1c0 ^
7343aa0e9 ^
7e0da3e8f ^
4d4b3b1c0 ^
7343aa0e9 ^
7e0da3e8f ^
4d4b3b1c0 ^
7343aa0e9 ^

4d4b3b1c0 ^
7343aa0e9 ^

4d4b3b1c0 ^
7343aa0e9 ^
4d4b3b1c0 ^
7343aa0e9 ^

4d4b3b1c0 ^
7343aa0e9 ^
4d4b3b1c0 ^
7343aa0e9 ^

4d4b3b1c0 ^
7343aa0e9 ^
4d4b3b1c0 ^
7343aa0e9 ^

4d4b3b1c0 ^
7343aa0e9 ^
4d4b3b1c0 ^
7343aa0e9 ^
4d4b3b1c0 ^

7343aa0e9 ^



4d4b3b1c0 ^

7343aa0e9 ^
4d4b3b1c0 ^

bc738d63a ^



4d4b3b1c0 ^

7343aa0e9 ^
4d4b3b1c0 ^

93eb9c456 ^




7343aa0e9 ^












































































93eb9c456 ^
4d4b3b1c0 ^
7343aa0e9 ^
4d4b3b1c0 ^

7343aa0e9 ^



4d4b3b1c0 ^
7343aa0e9 ^
93eb9c456 ^

4d4b3b1c0 ^
7343aa0e9 ^
93eb9c456 ^
4d4b3b1c0 ^
93eb9c456 ^
4d4b3b1c0 ^
93eb9c456 ^
4d4b3b1c0 ^
7343aa0e9 ^
4d4b3b1c0 ^



93eb9c456 ^
7343aa0e9 ^
4d4b3b1c0 ^

7e0da3e8f ^

93eb9c456 ^
7e0da3e8f ^
4d4b3b1c0 ^
7343aa0e9 ^
4d4b3b1c0 ^

7e0da3e8f ^


7343aa0e9 ^
45a7c51f0 ^
4d4b3b1c0 ^


7343aa0e9 ^
bc738d63a ^

4d4b3b1c0 ^
7343aa0e9 ^
4d4b3b1c0 ^
7343aa0e9 ^
4d4b3b1c0 ^

7e0da3e8f ^


4d4b3b1c0 ^
7343aa0e9 ^

4d4b3b1c0 ^
7343aa0e9 ^
4d4b3b1c0 ^








1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243