• Russ Cox's avatar
    os: do not return Lstat errors from Readdir · ef805fe3
    Russ Cox authored
    This CL restores the Go 1.1.2 semantics for os.File's Readdir method.
    
    The code in Go 1.1.2 was rewritten mainly because it looked buggy.
    This new version attempts to be clearer but still provide the 1.1.2 results.
    
    The important diff is not this CL's version against tip but this CL's version
    against Go 1.1.2.
    
    Go 1.1.2:
    
            names, err := f.Readdirnames(n)
            fi = make([]FileInfo, len(names))
            for i, filename := range names {
                    fip, err := Lstat(dirname + filename)
                    if err == nil {
                            fi[i] = fip
                    } else {
                            fi[i] = &fileStat{name: filename}
                    }
            }
            return fi, err
    
    This CL:
    
            names, err := f.Readdirnames(n)
            fi = make([]FileInfo, len(names))
            for i, filename := range names {
                    fip, lerr := lstat(dirname + filename)
                    if lerr != nil {
                            fi[i] = &fileStat{name: filename}
                            continue
                    }
                    fi[i] = fip
            }
            return fi, err
    
    The changes from Go 1.1.2 are stylistic, not semantic:
    1. Use lstat instead of Lstat, for testing (done before this CL).
    2. Make error handling in loop body look more like an error case.
    3. Use separate error variable name in loop body, to be clear
       we are not trying to influence the final return result.
    
    Fixes #6656.
    Fixes #6680.
    
    R=golang-dev, bradfitz
    CC=golang-dev
    https://golang.org/cl/18870043
    ef805fe3
Name
Last commit
Last update
..
exec Loading commit data...
signal Loading commit data...
user Loading commit data...
dir_plan9.go Loading commit data...
dir_unix.go Loading commit data...
dir_windows.go Loading commit data...
doc.go Loading commit data...
env.go Loading commit data...
env_test.go Loading commit data...
env_unix_test.go Loading commit data...
error.go Loading commit data...
error_plan9.go Loading commit data...
error_test.go Loading commit data...
error_unix.go Loading commit data...
error_windows.go Loading commit data...
error_windows_test.go Loading commit data...
exec.go Loading commit data...
exec_plan9.go Loading commit data...
exec_posix.go Loading commit data...
exec_unix.go Loading commit data...
exec_windows.go Loading commit data...
export_test.go Loading commit data...
file.go Loading commit data...
file_plan9.go Loading commit data...
file_posix.go Loading commit data...
file_unix.go Loading commit data...
file_windows.go Loading commit data...
getwd.go Loading commit data...
getwd_darwin.go Loading commit data...
os_test.go Loading commit data...
os_unix_test.go Loading commit data...
path.go Loading commit data...
path_plan9.go Loading commit data...
path_test.go Loading commit data...
path_unix.go Loading commit data...
path_windows.go Loading commit data...
pipe_bsd.go Loading commit data...
pipe_linux.go Loading commit data...
proc.go Loading commit data...
stat_darwin.go Loading commit data...
stat_dragonfly.go Loading commit data...
stat_freebsd.go Loading commit data...
stat_linux.go Loading commit data...
stat_netbsd.go Loading commit data...
stat_openbsd.go Loading commit data...
stat_plan9.go Loading commit data...
stat_windows.go Loading commit data...
str.go Loading commit data...
sys_bsd.go Loading commit data...
sys_linux.go Loading commit data...
sys_plan9.go Loading commit data...
sys_windows.go Loading commit data...
types.go Loading commit data...
types_notwin.go Loading commit data...
types_windows.go Loading commit data...