libgo: Update to weekly.2012-02-07.

[pf3gnuchains/gcc-fork.git] / libgo / go / os / stat.go

diff --git a/libgo/go/os/stat.go b/libgo/go/os/stat.go
index 8eb4ab4..7890072 100644 (file)
--- a/libgo/go/os/stat.go
+++ b/libgo/go/os/stat.go
@@ -2,39 +2,55 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// AMD64, Linux
-
 package os
 
-import syscall "syscall"
+import (
+       "syscall"
+       "time"
+)
 
-func isSymlink(stat *syscall.Stat_t) bool {
-       return stat.Mode & syscall.S_IFMT == syscall.S_IFLNK
+func sameFile(sys1, sys2 interface{}) bool {
+       stat1 := sys1.(*syscall.Stat_t)
+       stat2 := sys2.(*syscall.Stat_t)
+       return stat1.Dev == stat2.Dev && stat1.Ino == stat2.Ino
 }
 
-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 = int(stat.Uid)
-       fi.Gid = int(stat.Gid)
-       fi.Rdev = uint64(stat.Rdev)
-       fi.Size = int64(stat.Size)
-       fi.Blksize = int64(stat.Blksize)
-       fi.Blocks = int64(stat.Blocks)
-       fi.Atime_ns = int64(stat.Atime.Sec)*1e9 + int64(stat.Atime.Nsec)
-       fi.Mtime_ns = int64(stat.Mtime.Sec)*1e9 + int64(stat.Mtime.Nsec)
-       fi.Ctime_ns = int64(stat.Ctime.Sec)*1e9 + int64(stat.Ctime.Nsec)
-       for i := len(name)-1; i >= 0; i-- {
-               if name[i] == '/' {
-                       name = name[i+1:]
-                       break
-               }
+func fileInfoFromStat(st *syscall.Stat_t, name string) FileInfo {
+       fs := &fileStat{
+               name:    basename(name),
+               size:    int64(st.Size),
+               modTime: timespecToTime(st.Mtime),
+               sys:     st,
+       }
+       fs.mode = FileMode(st.Mode & 0777)
+       switch st.Mode & syscall.S_IFMT {
+       case syscall.S_IFBLK, syscall.S_IFCHR:
+               fs.mode |= ModeDevice
+       case syscall.S_IFDIR:
+               fs.mode |= ModeDir
+       case syscall.S_IFIFO:
+               fs.mode |= ModeNamedPipe
+       case syscall.S_IFLNK:
+               fs.mode |= ModeSymlink
+       case syscall.S_IFREG:
+               // nothing to do
+       case syscall.S_IFSOCK:
+               fs.mode |= ModeSocket
        }
-       fi.Name = name
-       if isSymlink(lstat) && !isSymlink(stat) {
-               fi.FollowedSymlink = true
+       if st.Mode&syscall.S_ISGID != 0 {
+               fs.mode |= ModeSetgid
        }
-       return fi
+       if st.Mode&syscall.S_ISUID != 0 {
+               fs.mode |= ModeSetuid
+       }
+       return fs
+}
+
+func timespecToTime(ts syscall.Timespec) time.Time {
+       return time.Unix(int64(ts.Sec), int64(ts.Nsec))
+}
+
+// For testing.
+func atime(fi FileInfo) time.Time {
+       return timespecToTime(fi.Sys().(*syscall.Stat_t).Atime)
 }