diff options
Diffstat (limited to 'src/pkg/os/dir_windows.go')
| -rw-r--r-- | src/pkg/os/dir_windows.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/pkg/os/dir_windows.go b/src/pkg/os/dir_windows.go index 0d8267b59..a4df9d3ea 100644 --- a/src/pkg/os/dir_windows.go +++ b/src/pkg/os/dir_windows.go @@ -4,14 +4,16 @@ package os -func (file *File) Readdirnames(count int) (names []string, err Error) { - fis, e := file.Readdir(count) - if e != nil { - return nil, e +func (file *File) Readdirnames(n int) (names []string, err Error) { + fis, err := file.Readdir(n) + // If n > 0 and we get an error, we return now. + // If n < 0, we return whatever we got + any error. + if n > 0 && err != nil { + return nil, err } names = make([]string, len(fis)) for i, fi := range fis { names[i] = fi.Name } - return names, nil + return names, err } |