octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-05-28 22:50:48 +00:00
Code Issues Releases Wiki Activity

move fillExtra to node.go

Browse Source
This commit is contained in:
Florian Weingarten 2015-04-29 03:45:24 +00:00
parent 91a2a5f90a
commit 6ba11d8fb7
3 changed files with 55 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
node.go
View File

@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"os"
"os/user"
"strconv"
"syscall"
"time"
@ -337,3 +338,49 @@ func (node *Node) isNewer(path string, fi os.FileInfo) bool {
debug.Log("node.isNewer", "node %v is not newer", path)
return false
}
func (node *Node) fillUser(stat *syscall.Stat_t) error {
node.UID = stat.Uid
node.GID = stat.Gid
u, err := user.LookupId(strconv.Itoa(int(stat.Uid)))
if err != nil {
return err
}
node.User = u.Username
return nil
}
func (node *Node) fillExtra(path string, fi os.FileInfo) error {
stat, ok := fi.Sys().(*syscall.Stat_t)
if !ok {
return nil
}
node.Inode = stat.Ino
node.fillUser(stat)
node.fillTimes(stat)
var err error
switch node.Type {
case "file":
node.Size = uint64(stat.Size)
node.Links = uint64(stat.Nlink)
case "dir":
case "symlink":
node.LinkTarget, err = os.Readlink(path)
case "dev":
node.fillDevice(stat)
case "chardev":
node.fillDevice(stat)
case "fifo":
case "socket":
default:
err = fmt.Errorf("invalid node type %q", node.Type)
}
return err
}

38
node_darwin.go
View File

@ -15,43 +15,13 @@ func (node *Node) OpenForReading() (*os.File, error) {
return os.Open(node.path)
}
func (node *Node) fillExtra(path string, fi os.FileInfo) error {
stat, ok := fi.Sys().(*syscall.Stat_t)
if !ok {
return nil
}
func (node *Node) fillTimes(stat *syscall.Stat_t) {
node.ChangeTime = time.Unix(stat.Ctimespec.Unix())
node.AccessTime = time.Unix(stat.Atimespec.Unix())
node.UID = stat.Uid
node.GID = stat.Gid
}
if u, err := user.LookupId(strconv.Itoa(int(stat.Uid))); err == nil {
node.User = u.Username
}
node.Inode = stat.Ino
var err error
switch node.Type {
case "file":
node.Size = uint64(stat.Size)
node.Links = uint64(stat.Nlink)
case "dir":
case "symlink":
node.LinkTarget, err = os.Readlink(path)
case "dev":
node.Device = uint64(stat.Rdev)
case "chardev":
node.Device = uint64(stat.Rdev)
case "fifo":
case "socket":
default:
err = fmt.Errorf("invalid node type %q", node.Type)
}
return err
func (node *Node) fillDevice(stat *syscall.Stat_t) {
node.Device = uint64(stat.Rdev)
}
func (node *Node) createDevAt(path string) error {

41
node_linux.go
View File

@ -1,10 +1,7 @@
package restic
import (
"fmt"
"os"
"os/user"
"strconv"
"syscall"
"time"
)
@ -17,43 +14,13 @@ func (node *Node) OpenForReading() (*os.File, error) {
return file, err
}
func (node *Node) fillExtra(path string, fi os.FileInfo) error {
stat, ok := fi.Sys().(*syscall.Stat_t)
if !ok {
return nil
}
func (node *Node) fillTimes(stat *syscall.Stat_t) {
node.ChangeTime = time.Unix(stat.Ctim.Unix())
node.AccessTime = time.Unix(stat.Atim.Unix())
node.UID = stat.Uid
node.GID = stat.Gid
}
if u, err := user.LookupId(strconv.Itoa(int(stat.Uid))); err == nil {
node.User = u.Username
}
node.Inode = stat.Ino
var err error
switch node.Type {
case "file":
node.Size = uint64(stat.Size)
node.Links = uint64(stat.Nlink)
case "dir":
case "symlink":
node.LinkTarget, err = os.Readlink(path)
case "dev":
node.Device = stat.Rdev
case "chardev":
node.Device = stat.Rdev
case "fifo":
case "socket":
default:
err = fmt.Errorf("invalid node type %q", node.Type)
}
return err
func (node *Node) fillDevice(stat *syscall.Stat_t) {
node.Device = stat.Rdev
}
func (node *Node) createDevAt(path string) error {