X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=blobdiff_plain;f=dep.go;h=d7c874a95ea4d845592611a8e85377e0722b6af3;hp=df5ae27f2af9737b070b84df719a24f255328d2b;hb=fd3be6ccc0576edf0a74b9f312f8308482b7dd9c;hpb=07912df2f1935c7dd4e08f8e675ed989dbc97b31

diff --git a/dep.go b/dep.go
index df5ae27..d7c874a 100644
--- a/dep.go
+++ b/dep.go
@@ -30,8 +30,8 @@ import (
 	"path/filepath"
 
 	"go.cypherpunks.ru/recfile"
-	"golang.org/x/crypto/blake2b"
 	"golang.org/x/sys/unix"
+	"lukechampine.com/blake3"
 )
 
 var DirPrefix string
@@ -85,11 +85,8 @@ func fileCtime(fd *os.File) (string, error) {
 }
 
 func fileHash(fd *os.File) (string, error) {
-	h, err := blake2b.New256(nil)
-	if err != nil {
-		panic(err)
-	}
-	if _, err = io.Copy(h, bufio.NewReader(fd)); err != nil {
+	h := blake3.New(32, nil)
+	if _, err := io.Copy(h, bufio.NewReader(fd)); err != nil {
 		return "", err
 	}
 	return hex.EncodeToString(h.Sum(nil)), nil
@@ -126,30 +123,34 @@ func writeDep(fdDep *os.File, cwd, tgt string) error {
 	)
 }
 
-func writeDeps(fdDep *os.File, tgts []string) error {
+func writeDeps(fdDep *os.File, tgts []string) (err error) {
 	if fdDep == nil {
 		trace(CDebug, "no opened fdDep: %s", tgts)
 		return nil
 	}
 	for _, tgt := range tgts {
-		if _, err := os.Stat(tgt); err == nil {
-			tgtAbs, err := filepath.Abs(tgt)
-			if err != nil {
-				panic(err)
-			}
-			tgtDir := path.Join(Cwd, DirPrefix)
-			tgtRel, err := filepath.Rel(tgtDir, tgtAbs)
-			if err != nil {
-				panic(err)
-			}
-			if err = writeDep(fdDep, tgtDir, tgtRel); err != nil {
-				return err
-			}
+		tgtAbs, err := filepath.Abs(tgt)
+		if err != nil {
+			panic(err)
+		}
+		tgtDir := path.Join(Cwd, DirPrefix)
+		tgtRel, err := filepath.Rel(tgtDir, tgtAbs)
+		if err != nil {
+			panic(err)
+		}
+		if _, errStat := os.Stat(tgt); errStat == nil {
+			err = writeDep(fdDep, tgtDir, tgtRel)
 		} else {
-			trace(CDebug, "skipping dep record, can not stat: %s", tgt)
+			trace(CDebug, "ifchange: %s <- %s (unexisting)", fdDep.Name(), tgtRel)
+			err = recfileWrite(
+				fdDep,
+				recfile.Field{Name: "Type", Value: DepTypeIfchange},
+				recfile.Field{Name: "Target", Value: tgtRel},
+				recfile.Field{Name: "Ctime", Value: "0.0"},
+			)
 		}
 	}
-	return nil
+	return
 }
 
 type DepInfo struct {