c2047754c3
Compiler changes:
* Change map assignment to use mapassign and assign value directly.
* Change string iteration to use decoderune, faster for ASCII strings.
* Change makeslice to take int, and use makeslice64 for larger values.
* Add new noverflow field to hmap struct used for maps.
Unresolved problems, to be fixed later:
* Commented out test in go/types/sizes_test.go that doesn't compile.
* Commented out reflect.TestStructOf test for padding after zero-sized field.
Reviewed-on: https://go-review.googlesource.com/35231
gotools/:
Updates for Go 1.8rc1.
* Makefile.am (go_cmd_go_files): Add bug.go.
(s-zdefaultcc): Write defaultPkgConfig.
* Makefile.in: Rebuild.
From-SVN: r244456
39 lines
894 B
Go
39 lines
894 B
Go
// Copyright 2009 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
|
|
|
|
package os
|
|
|
|
import (
|
|
"io"
|
|
)
|
|
|
|
func (f *File) readdir(n int) (fi []FileInfo, err error) {
|
|
dirname := f.name
|
|
if dirname == "" {
|
|
dirname = "."
|
|
}
|
|
names, err := f.Readdirnames(n)
|
|
fi = make([]FileInfo, 0, len(names))
|
|
for _, filename := range names {
|
|
fip, lerr := lstat(dirname + "/" + filename)
|
|
if IsNotExist(lerr) {
|
|
// File disappeared between readdir + stat.
|
|
// Just treat it as if it didn't exist.
|
|
continue
|
|
}
|
|
if lerr != nil {
|
|
return fi, lerr
|
|
}
|
|
fi = append(fi, fip)
|
|
}
|
|
if len(fi) == 0 && err == nil && n > 0 {
|
|
// Per File.Readdir, the slice must be non-empty or err
|
|
// must be non-nil if n > 0.
|
|
err = io.EOF
|
|
}
|
|
return fi, err
|
|
}
|