X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=blobdiff_plain;f=inode.go;h=50db586cb4cc6d1eaec726eafa231f56d7daaf34;hp=afb323cb15aa6deb3a89c231c3ea9247ebd17a34;hb=b4eefdd675c9aef9ff8bd1089d031ee05733195b;hpb=0030b3e73152bf9d9ad3e435fa42e607c7865321

diff --git a/inode.go b/inode.go
index afb323c..50db586 100644
--- a/inode.go
+++ b/inode.go
@@ -1,6 +1,6 @@
 /*
 goredo -- djb's redo implementation on pure Go
-Copyright (C) 2020-2022 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2020-2023 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -43,6 +43,7 @@ var InodeTrust InodeTrustType
 
 type Inode struct {
 	Size      int64
+	InodeNum  uint64
 	CtimeSec  int64
 	CtimeNsec int64
 	MtimeSec  int64
@@ -53,6 +54,9 @@ func (our *Inode) Equals(their *Inode) bool {
 	if our.Size != their.Size {
 		return false
 	}
+	if our.InodeNum != their.InodeNum {
+		return false
+	}
 	switch InodeTrust {
 	case InodeTrustCtime:
 		if our.CtimeSec != their.CtimeSec || our.CtimeNsec != their.CtimeNsec {
@@ -72,6 +76,7 @@ func (our *Inode) Equals(their *Inode) bool {
 func (inode *Inode) RecfileFields() []recfile.Field {
 	return []recfile.Field{
 		{Name: "Size", Value: strconv.FormatInt(inode.Size, 10)},
+		{Name: "InodeNum", Value: strconv.FormatUint(inode.InodeNum, 10)},
 		{Name: "CtimeSec", Value: strconv.FormatInt(inode.CtimeSec, 10)},
 		{Name: "CtimeNsec", Value: strconv.FormatInt(inode.CtimeNsec, 10)},
 		{Name: "MtimeSec", Value: strconv.FormatInt(inode.MtimeSec, 10)},
@@ -79,8 +84,19 @@ func (inode *Inode) RecfileFields() []recfile.Field {
 	}
 }
 
-func inodeFromFile(fd *os.File) (*Inode, error) {
-	var fi os.FileInfo
+func inodeFromFileStat(fi os.FileInfo, stat unix.Stat_t) *Inode {
+	ctimeSec, ctimeNsec := stat.Ctim.Unix()
+	mtimeSec := fi.ModTime().Unix()
+	mtimeNsec := fi.ModTime().UnixNano()
+	return &Inode{
+		Size:     fi.Size(),
+		InodeNum: uint64(stat.Ino),
+		CtimeSec: ctimeSec, CtimeNsec: ctimeNsec,
+		MtimeSec: mtimeSec, MtimeNsec: mtimeNsec,
+	}
+}
+
+func inodeFromFileByFd(fd *os.File) (*Inode, error) {
 	fi, err := fd.Stat()
 	if err != nil {
 		return nil, err
@@ -90,18 +106,25 @@ func inodeFromFile(fd *os.File) (*Inode, error) {
 	if err != nil {
 		return nil, err
 	}
-	ctimeSec, ctimeNsec := stat.Ctim.Unix()
-	mtimeSec := fi.ModTime().Unix()
-	mtimeNsec := fi.ModTime().UnixNano()
-	return &Inode{
-		Size:     fi.Size(),
-		CtimeSec: ctimeSec, CtimeNsec: ctimeNsec,
-		MtimeSec: mtimeSec, MtimeNsec: mtimeNsec,
-	}, nil
+	return inodeFromFileStat(fi, stat), nil
+}
+
+func inodeFromFileByPath(p string) (*Inode, error) {
+	fi, err := os.Stat(p)
+	if err != nil {
+		return nil, err
+	}
+	var stat unix.Stat_t
+	err = unix.Stat(p, &stat)
+	if err != nil {
+		return nil, err
+	}
+	return inodeFromFileStat(fi, stat), nil
 }
 
 func inodeFromRec(m map[string]string) (*Inode, error) {
 	size := m["Size"]
+	inodeNum := m["InodeNum"]
 	ctimeSec := m["CtimeSec"]
 	ctimeNsec := m["CtimeNsec"]
 	mtimeSec := m["MtimeSec"]
@@ -121,6 +144,12 @@ func inodeFromRec(m map[string]string) (*Inode, error) {
 	if err != nil {
 		return nil, err
 	}
+	if inodeNum != "" {
+		inode.InodeNum, err = strconv.ParseUint(inodeNum, 10, 64)
+		if err != nil {
+			return nil, err
+		}
+	}
 	inode.CtimeSec, err = strconv.ParseInt(ctimeSec, 10, 64)
 	if err != nil {
 		return nil, err