From 770a7116c39ebde9433b973c2fa881f60f8804a9 Mon Sep 17 00:00:00 2001 From: bptato Date: Thu, 21 Dec 2023 17:37:33 +0100 Subject: file: do not use streams --- adapter/protocol/file.nim | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'adapter/protocol/file.nim') diff --git a/adapter/protocol/file.nim b/adapter/protocol/file.nim index 3513ab3c..67bea420 100644 --- a/adapter/protocol/file.nim +++ b/adapter/protocol/file.nim @@ -1,6 +1,5 @@ import std/algorithm import std/os -import std/streams import std/times import dirlist @@ -79,20 +78,18 @@ Symbolic link to """ & sl & """
""") -proc loadFile(istream: Stream) = +proc loadFile(f: File) = # No headers, we'll let the browser figure out the file type. stdout.write("\n") - let outs = newFileStream(stdout) - while not istream.atEnd: - const BufferSize = 16384 - var buffer {.noinit.}: array[BufferSize, char] - while true: - let n = readData(istream, addr buffer[0], BufferSize) - if n == 0: - break - outs.writeData(addr buffer[0], n) - if n < BufferSize: - break + const BufferSize = 16384 + var buffer {.noinit.}: array[BufferSize, char] + while true: + let n = readBuffer(f, addr buffer[0], BufferSize) + if n == 0: + break + let n2 = stdout.writeBuffer(addr buffer[0], n) + if n2 < n or n < BufferSize: + break proc main() = if getEnv("MAPPED_URI_HOST") != "": @@ -102,16 +99,15 @@ proc main() = return let opath = getEnv("MAPPED_URI_PATH") let path = percentDecode(opath) - let istream = newFileStream(path, fmRead) - if istream == nil: - if dirExists(path): - loadDir(path, opath) - elif symlinkExists(path): - loadSymlink(path) - else: - let code = int(ERROR_FILE_NOT_FOUND) - stdout.write("Cha-Control: ConnectionError " & $code) + var f: File + if f.open(path, fmRead): + loadFile(f) + elif dirExists(path): + loadDir(path, opath) + elif symlinkExists(path): + loadSymlink(path) else: - loadFile(istream) + let code = int(ERROR_FILE_NOT_FOUND) + stdout.write("Cha-Control: ConnectionError " & $code) main() -- cgit 1.4.1-2-gfad0 ue='grep'>log msg
path: root/html/078emit-hex.subx.html
blob: cd6d982c6a8e75b2a8b85bd3cf90eed3ed11bf12 (plain) (blame)
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
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304