@@ -114,19 +114,12 @@ func stat(reqFsPath string, visitFs bool) (file *os.File, item os.FileInfo, err
114
114
return
115
115
}
116
116
117
- func readdir (file * os.File , item os.FileInfo , visitFs bool ) (subItems []os.FileInfo , errs [] error ) {
117
+ func readdir (file * os.File , item os.FileInfo , visitFs bool ) (subItems []os.FileInfo , err error ) {
118
118
if ! visitFs || file == nil || item == nil || ! item .IsDir () {
119
119
return
120
120
}
121
121
122
- var err error
123
- subItems , err = file .Readdir (0 )
124
- if err != nil {
125
- errs = append (errs , err )
126
- return
127
- }
128
-
129
- return
122
+ return file .Readdir (0 )
130
123
}
131
124
132
125
func (h * handler ) mergeAlias (rawRequestPath string , subItems * []os.FileInfo ) []error {
@@ -295,18 +288,22 @@ func (h *handler) getResponseData(r *http.Request) (data *responseData) {
295
288
if _statErr != nil {
296
289
errs = append (errs , _statErr )
297
290
notFound = os .IsNotExist (_statErr )
298
- internalError = internalError || ! notFound
291
+ internalError = ! notFound
299
292
}
300
293
301
294
itemName := getItemName (item , r )
302
295
303
- subInfos , _readdirErrs := readdir (file , item , needResponseBody (r .Method ))
304
- errs = append (errs , _readdirErrs ... )
305
- internalError = internalError || len (_readdirErrs ) > 0
296
+ subInfos , _readdirErr := readdir (file , item , needResponseBody (r .Method ))
297
+ if _readdirErr != nil {
298
+ errs = append (errs , _readdirErr )
299
+ internalError = true
300
+ }
306
301
307
302
_mergeErrs := h .mergeAlias (rawReqPath , & subInfos )
308
- errs = append (errs , _mergeErrs ... )
309
- internalError = internalError || len (_mergeErrs ) > 0
303
+ if len (_mergeErrs ) > 0 {
304
+ errs = append (errs , _mergeErrs ... )
305
+ internalError = true
306
+ }
310
307
311
308
subInfos = h .FilterItems (subInfos )
312
309
0 commit comments