From: Alex Brainman Date: Sun, 29 May 2011 01:59:35 +0000 (+1000) Subject: os: fix windows version of Readdir(0) X-Git-Tag: weekly.2011-06-02~75 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=505f0bb3ce55871b7c79cfcd34fa468f5cee73ef;p=gostls13.git os: fix windows version of Readdir(0) Fixes #1893. R=golang-dev CC=bradfitz, golang-dev https://golang.org/cl/4528106 --- diff --git a/src/pkg/os/file_windows.go b/src/pkg/os/file_windows.go index 74ff3eb88c..ac37b8e2d3 100644 --- a/src/pkg/os/file_windows.go +++ b/src/pkg/os/file_windows.go @@ -145,9 +145,10 @@ func (file *File) Readdir(n int) (fi []FileInfo, err Error) { return nil, &PathError{"Readdir", file.name, ENOTDIR} } di := file.dirinfo - wantAll := n < 0 + wantAll := n <= 0 size := n - if size < 0 { + if wantAll { + n = -1 size = 100 } fi = make([]FileInfo, 0, size) // Empty with room to grow.