X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=inode.go;h=27cfaa72078a0b3c9c67c5cd0cd31265a2c9b110;hb=HEAD;hp=84c1b029974d8d3ff5401df5dd173f3dc58d3542;hpb=6dce71355599d4caf8267f6f02520037480f7ba3;p=goredo.git

diff --git a/inode.go b/inode.go
index 84c1b02..27cfaa7 100644
--- a/inode.go
+++ b/inode.go
@@ -1,25 +1,24 @@
-/*
-goredo -- djb's redo implementation on pure Go
-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
-the Free Software Foundation, version 3 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// goredo -- djb's redo implementation on pure Go
+// Copyright (C) 2020-2024 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
+// the Free Software Foundation, version 3 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Inode metainformation
 
 package main
 
 import (
+	"bytes"
 	"encoding/binary"
 	"os"
 	"strconv"
@@ -45,26 +44,26 @@ var InodeTrust InodeTrustType
 
 // It is big-endian 64-bit unsigned integers: size, inodeNum,
 // ctime sec, ctime nsec, mtime sec, mtime nsec.
-type Inode string
+type Inode [InodeLen]byte
 
-func (our Inode) Equals(their Inode) bool {
-	if our[:2*8] != their[:2*8] {
+func (our *Inode) Equals(their *Inode) bool {
+	if !bytes.Equal(our[:2*8], their[:2*8]) {
 		return false
 	}
 	switch InodeTrust {
 	case InodeTrustCtime:
-		if our[2*8:4*8] != their[2*8:4*8] {
+		if !bytes.Equal(our[2*8:4*8], their[2*8:4*8]) {
 			return false
 		}
 	case InodeTrustMtime:
-		if our[4*8:6*8] != their[4*8:6*8] {
+		if !bytes.Equal(our[4*8:6*8], their[4*8:6*8]) {
 			return false
 		}
 	}
 	return true
 }
 
-func (inode Inode) RecfileFields() []recfile.Field {
+func (inode *Inode) RecfileFields() []recfile.Field {
 	return []recfile.Field{
 		{Name: "Size", Value: strconv.FormatUint(binary.BigEndian.Uint64(
 			[]byte(inode[0*8:1*8])), 10)},
@@ -81,21 +80,21 @@ func (inode Inode) RecfileFields() []recfile.Field {
 	}
 }
 
-func inodeFromFileStat(fi os.FileInfo, stat unix.Stat_t) Inode {
+func inodeFromFileStat(fi os.FileInfo, stat unix.Stat_t) *Inode {
 	ctimeSec, ctimeNsec := stat.Ctim.Unix()
 	mtimeSec := fi.ModTime().Unix()
 	mtimeNsec := fi.ModTime().UnixNano()
-	buf := make([]byte, InodeLen)
-	binary.BigEndian.PutUint64(buf[0*8:1*8], uint64(fi.Size()))
-	binary.BigEndian.PutUint64(buf[1*8:2*8], uint64(stat.Ino))
-	binary.BigEndian.PutUint64(buf[2*8:3*8], uint64(ctimeSec))
-	binary.BigEndian.PutUint64(buf[3*8:4*8], uint64(ctimeNsec))
-	binary.BigEndian.PutUint64(buf[4*8:5*8], uint64(mtimeSec))
-	binary.BigEndian.PutUint64(buf[5*8:6*8], uint64(mtimeNsec))
-	return Inode(buf)
+	inode := new(Inode)
+	binary.BigEndian.PutUint64(inode[0*8:1*8], uint64(fi.Size()))
+	binary.BigEndian.PutUint64(inode[1*8:2*8], uint64(stat.Ino))
+	binary.BigEndian.PutUint64(inode[2*8:3*8], uint64(ctimeSec))
+	binary.BigEndian.PutUint64(inode[3*8:4*8], uint64(ctimeNsec))
+	binary.BigEndian.PutUint64(inode[4*8:5*8], uint64(mtimeSec))
+	binary.BigEndian.PutUint64(inode[5*8:6*8], uint64(mtimeNsec))
+	return inode
 }
 
-func inodeFromFileByFd(fd *os.File) (inode Inode, isDir bool, err error) {
+func inodeFromFileByFd(fd *os.File) (inode *Inode, isDir bool, err error) {
 	fi, err := fd.Stat()
 	if err != nil {
 		return
@@ -113,15 +112,15 @@ func inodeFromFileByFd(fd *os.File) (inode Inode, isDir bool, err error) {
 	return
 }
 
-func inodeFromFileByPath(p string) (Inode, error) {
+func inodeFromFileByPath(p string) (*Inode, error) {
 	fi, err := os.Stat(p)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 	var stat unix.Stat_t
 	err = unix.Stat(p, &stat)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 	return inodeFromFileStat(fi, stat), nil
 }