diff options
author | Russ Cox <rsc@golang.org> | 2010-04-09 14:37:53 -0700 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2010-04-09 14:37:53 -0700 |
commit | d13ec30e1e389fcd90e9d3be49765f49bf791f93 (patch) | |
tree | e41421e4ebcad24c8eb5bdd2501326b3cbe05bf2 | |
parent | 8a5ab739aa38cc36ce7cb0169ec93fd53954ff03 (diff) | |
download | golang-d13ec30e1e389fcd90e9d3be49765f49bf791f93.tar.gz |
freebsd: fix build, maybe
R=r
CC=golang-dev
http://codereview.appspot.com/909041
-rw-r--r-- | src/pkg/os/stat_freebsd.go | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/pkg/os/stat_freebsd.go b/src/pkg/os/stat_freebsd.go index 84a6c7859..dd33d8cc6 100644 --- a/src/pkg/os/stat_freebsd.go +++ b/src/pkg/os/stat_freebsd.go @@ -10,29 +10,29 @@ func isSymlink(stat *syscall.Stat_t) bool { return stat.Mode&syscall.S_IFMT == syscall.S_IFLNK } -func dirFromStat(name string, dir *Dir, lstat, stat *syscall.Stat_t) *Dir { - dir.Dev = uint64(stat.Dev) - dir.Ino = uint64(stat.Ino) - dir.Nlink = uint64(stat.Nlink) - dir.Mode = uint32(stat.Mode) - dir.Uid = stat.Uid - dir.Gid = stat.Gid - dir.Rdev = uint64(stat.Rdev) - dir.Size = uint64(stat.Size) - dir.Blksize = uint64(stat.Blksize) - dir.Blocks = uint64(stat.Blocks) - dir.Atime_ns = uint64(syscall.TimespecToNsec(stat.Atimespec)) - dir.Mtime_ns = uint64(syscall.TimespecToNsec(stat.Mtimespec)) - dir.Ctime_ns = uint64(syscall.TimespecToNsec(stat.Ctimespec)) +func fileInfoFromStat(name string, fi *FileInfo, lstat, stat *syscall.Stat_t) *FileInfo { + fi.Dev = uint64(stat.Dev) + fi.Ino = uint64(stat.Ino) + fi.Nlink = uint64(stat.Nlink) + fi.Mode = uint32(stat.Mode) + fi.Uid = stat.Uid + fi.Gid = stat.Gid + fi.Rdev = uint64(stat.Rdev) + fi.Size = uint64(stat.Size) + fi.Blksize = uint64(stat.Blksize) + fi.Blocks = uint64(stat.Blocks) + fi.Atime_ns = uint64(syscall.TimespecToNsec(stat.Atimespec)) + fi.Mtime_ns = uint64(syscall.TimespecToNsec(stat.Mtimespec)) + fi.Ctime_ns = uint64(syscall.TimespecToNsec(stat.Ctimespec)) for i := len(name) - 1; i >= 0; i-- { if name[i] == '/' { name = name[i+1:] break } } - dir.Name = name + fi.Name = name if isSymlink(lstat) && !isSymlink(stat) { - dir.FollowedSymlink = true + fi.FollowedSymlink = true } - return dir + return fi } |