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

diff --git a/inode.go b/inode.go
index 2f2285d..84c1b02 100644
--- a/inode.go
+++ b/inode.go
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-	"errors"
+	"encoding/binary"
 	"os"
 	"strconv"
 
@@ -28,6 +28,8 @@ import (
 	"golang.org/x/sys/unix"
 )
 
+const InodeLen = 6 * 8
+
 type InodeTrustType int
 
 //go:generate stringer -type=InodeTrustType
@@ -41,62 +43,59 @@ const (
 
 var InodeTrust InodeTrustType
 
-type Inode struct {
-	Size      int64
-	InodeNum  uint64
-	CtimeSec  int64
-	CtimeNsec int64
-	MtimeSec  int64
-	MtimeNsec int64
-}
+// It is big-endian 64-bit unsigned integers: size, inodeNum,
+// ctime sec, ctime nsec, mtime sec, mtime nsec.
+type Inode string
 
-func (our *Inode) Equals(their *Inode) bool {
-	if our.Size != their.Size {
-		return false
-	}
-	if our.InodeNum != their.InodeNum {
+func (our Inode) Equals(their Inode) bool {
+	if our[:2*8] != their[:2*8] {
 		return false
 	}
 	switch InodeTrust {
 	case InodeTrustCtime:
-		if our.CtimeSec != their.CtimeSec || our.CtimeNsec != their.CtimeNsec {
+		if our[2*8:4*8] != their[2*8:4*8] {
 			return false
 		}
 	case InodeTrustMtime:
-		if our.MtimeSec == 0 || our.MtimeNsec == 0 {
-			return false
-		}
-		if our.MtimeSec != their.MtimeSec || our.MtimeNsec != their.MtimeNsec {
+		if 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.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)},
-		{Name: "MtimeNsec", Value: strconv.FormatInt(inode.MtimeNsec, 10)},
+		{Name: "Size", Value: strconv.FormatUint(binary.BigEndian.Uint64(
+			[]byte(inode[0*8:1*8])), 10)},
+		{Name: "InodeNum", Value: strconv.FormatUint(binary.BigEndian.Uint64(
+			[]byte(inode[1*8:2*8])), 10)},
+		{Name: "CtimeSec", Value: strconv.FormatUint(binary.BigEndian.Uint64(
+			[]byte(inode[2*8:3*8])), 10)},
+		{Name: "CtimeNsec", Value: strconv.FormatUint(binary.BigEndian.Uint64(
+			[]byte(inode[3*8:4*8])), 10)},
+		{Name: "MtimeSec", Value: strconv.FormatUint(binary.BigEndian.Uint64(
+			[]byte(inode[4*8:5*8])), 10)},
+		{Name: "MtimeNsec", Value: strconv.FormatUint(binary.BigEndian.Uint64(
+			[]byte(inode[5*8:6*8])), 10)},
 	}
 }
 
-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()
-	return &Inode{
-		Size:     fi.Size(),
-		InodeNum: uint64(stat.Ino),
-		CtimeSec: ctimeSec, CtimeNsec: ctimeNsec,
-		MtimeSec: mtimeSec, MtimeNsec: mtimeNsec,
-	}
+	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)
 }
 
-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
@@ -114,67 +113,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 nil, err
+		return "", err
 	}
 	var stat unix.Stat_t
 	err = unix.Stat(p, &stat)
 	if err != nil {
-		return nil, err
+		return "", 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"]
-	mtimeNsec := m["MtimeNsec"]
-	if size == "" {
-		return nil, errors.New("Size is missing")
-	}
-	if ctimeSec == "" {
-		return nil, errors.New("CtimeSec is missing")
-	}
-	if ctimeNsec == "" {
-		return nil, errors.New("CtimeNsec is missing")
-	}
-	inode := Inode{}
-	var err error
-	inode.Size, err = strconv.ParseInt(size, 10, 64)
-	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
-	}
-	inode.CtimeNsec, err = strconv.ParseInt(ctimeNsec, 10, 64)
-	if err != nil {
-		return nil, err
-	}
-	if mtimeSec != "" {
-		if mtimeNsec == "" {
-			return nil, errors.New("MtimeNsec is missing")
-		}
-		inode.MtimeSec, err = strconv.ParseInt(mtimeSec, 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		inode.MtimeNsec, err = strconv.ParseInt(mtimeNsec, 10, 64)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return &inode, nil
-}