X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=inode.go;h=50db586cb4cc6d1eaec726eafa231f56d7daaf34;hb=b69d2ab11a495413ecc16a9bfea0d105b030c606;hp=82b61984ab0f37e05c14dd0e2034410ec0dfe4d2;hpb=c1b88a9301143b14fc3ef2a9b6bd9ac2ecf070f3;p=goredo.git

diff --git a/inode.go b/inode.go
index 82b6198..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
@@ -84,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
@@ -95,15 +106,20 @@ 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(),
-		InodeNum: uint64(stat.Ino),
-		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) {