os: Fix fileInfoFromStat for Solaris.

From Rainer Orth.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182402 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 2722fcb..5bbeb89 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -763,6 +763,12 @@ endif
 endif
 endif
 
+if LIBGO_IS_SOLARIS
+go_os_stat_file = go/os/stat_solaris.go
+else
+go_os_stat_file = go/os/stat.go
+endif
+
 go_os_files = \
        $(go_os_dir_file) \
        go/os/dir.go \
@@ -779,7 +785,7 @@ go_os_files = \
        go/os/path.go \
        go/os/path_unix.go \
        go/os/proc.go \
-       go/os/stat.go \
+       $(go_os_stat_file) \
        go/os/str.go \
        $(go_os_sys_file) \
        go/os/time.go \

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 244cda8..70f3aca 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1096,6 +1096,8 @@ go_net_files = \
 @LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_os_sys_file = go/os/sys_uname.go
 @LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_os_sys_file = go/os/sys_uname.go
 @LIBGO_IS_LINUX_TRUE@go_os_sys_file = go/os/sys_linux.go
+@LIBGO_IS_SOLARIS_FALSE@go_os_stat_file = go/os/stat.go
+@LIBGO_IS_SOLARIS_TRUE@go_os_stat_file = go/os/stat_solaris.go
 go_os_files = \
        $(go_os_dir_file) \
        go/os/dir.go \
@@ -1112,7 +1114,7 @@ go_os_files = \
        go/os/path.go \
        go/os/path_unix.go \
        go/os/proc.go \
-       go/os/stat.go \
+       $(go_os_stat_file) \
        go/os/str.go \
        $(go_os_sys_file) \
        go/os/time.go \

diff --git a/libgo/go/os/stat_solaris.go b/libgo/go/os/stat_solaris.go
new file mode 100644 (file)
index 0000000..2321da6
--- /dev/null
+++ b/libgo/go/os/stat_solaris.go
@@ -0,0 +1,56 @@
+// Copyright 2011 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.
+
+package os
+
+import (
+       "syscall"
+       "time"
+)
+
+func sameFile(fs1, fs2 *FileStat) bool {
+       sys1 := fs1.Sys.(*syscall.Stat_t)
+       sys2 := fs2.Sys.(*syscall.Stat_t)
+       return sys1.Dev == sys2.Dev && sys1.Ino == sys2.Ino
+}
+
+func fileInfoFromStat(st *syscall.Stat_t, name string) FileInfo {
+       fs := &FileStat{
+               name:    basename(name),
+               size:    int64(st.Size),
+               modTime: timestrucToTime(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
+       }
+       if st.Mode&syscall.S_ISGID != 0 {
+               fs.mode |= ModeSetgid
+       }
+       if st.Mode&syscall.S_ISUID != 0 {
+               fs.mode |= ModeSetuid
+       }
+       return fs
+}
+
+func timestrucToTime(ts syscall.Timestruc) time.Time {
+       return time.Unix(int64(ts.Sec), int64(ts.Nsec))
+}
+
+// For testing.
+func atime(fi FileInfo) time.Time {
+       return timestrucToTime(fi.(*FileStat).Sys.(*syscall.Stat_t).Atime)
+}