X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=blobdiff_plain;f=ood.go;h=0552e2016112a46b037976dbfc88f26adf677b2a;hp=7f2adde90a24a12f09c090e54a654ba0e5b2cfe8;hb=fa0728d6bc790672982ba006961077371d2b552d;hpb=edb601644735972fac3efcdc27849b5b9b1f5fb7

diff --git a/ood.go b/ood.go
index 7f2adde..0552e20 100644
--- a/ood.go
+++ b/ood.go
@@ -1,5 +1,5 @@
 /*
-goredo -- redo implementation on pure Go
+goredo -- djb's redo implementation on pure Go
 Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
@@ -109,11 +109,14 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 
 	for _, m := range depInfo.ifchanges {
 		dep := m["Target"]
-		theirTs := m["Ctime"]
-		theirHsh := m["Hash"]
-		if dep == "" || theirTs == "" {
-			return ood, TgtErr{tgtOrig, errors.New("invalid format of .dep")}
+		if dep == "" {
+			return ood, TgtErr{tgtOrig, errors.New("invalid format of .rec: missing Target")}
+		}
+		theirInode, err := inodeFromRec(m)
+		if err != nil {
+			return ood, TgtErr{tgtOrig, fmt.Errorf("invalid format of .rec: %v", err)}
 		}
+		theirHsh := m["Hash"]
 		trace(CDebug, "ood: %s%s -> %s: checking", indent, tgtOrig, dep)
 
 		fd, err := os.Open(path.Join(cwd, dep))
@@ -127,14 +130,19 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 		}
 		defer fd.Close()
 
-		ts, err := fileCtime(fd)
+		inode, err := inodeFromFile(fd)
 		if err != nil {
 			return ood, TgtErr{tgtOrig, err}
 		}
-		if theirTs == ts {
-			trace(CDebug, "ood: %s%s -> %s: same ctime", indent, tgtOrig, dep)
+		if inode.Size != theirInode.Size {
+			trace(CDebug, "ood: %s%s -> %s: size differs", indent, tgtOrig, dep)
+			ood = true
+			goto Done
+		}
+		if InodeTrust && inode.Equals(theirInode) {
+			trace(CDebug, "ood: %s%s -> %s: same inode", indent, tgtOrig, dep)
 		} else {
-			trace(CDebug, "ood: %s%s -> %s: ctime differs", indent, tgtOrig, dep)
+			trace(CDebug, "ood: %s%s -> %s: inode differs", indent, tgtOrig, dep)
 			hsh, err := fileHash(fd)
 			if err != nil {
 				return ood, TgtErr{tgtOrig, err}