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

diff --git a/dep.go b/dep.go
index df5ae27..5d602f5 100644
--- a/dep.go
+++ b/dep.go
@@ -1,6 +1,6 @@
 /*
-goredo -- redo implementation on pure Go
-Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
+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
@@ -23,20 +23,23 @@ import (
 	"bufio"
 	"encoding/hex"
 	"errors"
-	"fmt"
 	"io"
 	"os"
 	"path"
 	"path/filepath"
 
 	"go.cypherpunks.ru/recfile"
-	"golang.org/x/crypto/blake2b"
-	"golang.org/x/sys/unix"
+	"lukechampine.com/blake3"
 )
 
-var DirPrefix string
+var (
+	DirPrefix string
+	DepCwd    string
 
-func recfileWrite(fdDep *os.File, fields ...recfile.Field) error {
+	ErrBadRecFormat = errors.New("invalid format of .rec")
+)
+
+func recfileWrite(fdDep io.StringWriter, fields ...recfile.Field) error {
 	w := recfile.NewWriter(fdDep)
 	if _, err := w.RecordStart(); err != nil {
 		return err
@@ -48,7 +51,7 @@ func recfileWrite(fdDep *os.File, fields ...recfile.Field) error {
 }
 
 func ifcreate(fdDep *os.File, tgt string) error {
-	trace(CDebug, "ifcreate: %s <- %s", fdDep.Name(), tgt)
+	tracef(CDebug, "ifcreate: %s <- %s", fdDep.Name(), tgt)
 	return recfileWrite(
 		fdDep,
 		recfile.Field{Name: "Type", Value: DepTypeIfcreate},
@@ -57,17 +60,17 @@ func ifcreate(fdDep *os.File, tgt string) error {
 }
 
 func always(fdDep *os.File) error {
-	trace(CDebug, "always: %s", fdDep.Name())
+	tracef(CDebug, "always: %s", fdDep.Name())
 	return recfileWrite(fdDep, recfile.Field{Name: "Type", Value: DepTypeAlways})
 }
 
 func stamp(fdDep, src *os.File) error {
 	var hsh string
-	hsh, err := fileHash(os.Stdin)
+	hsh, err := fileHash(src)
 	if err != nil {
 		return err
 	}
-	trace(CDebug, "stamp: %s <- %s", fdDep.Name(), hsh)
+	tracef(CDebug, "stamp: %s <- %s", fdDep.Name(), hsh)
 	return recfileWrite(
 		fdDep,
 		recfile.Field{Name: "Type", Value: DepTypeStamp},
@@ -75,28 +78,16 @@ func stamp(fdDep, src *os.File) error {
 	)
 }
 
-func fileCtime(fd *os.File) (string, error) {
-	var stat unix.Stat_t
-	if err := unix.Fstat(int(fd.Fd()), &stat); err != nil {
-		return "", err
-	}
-	sec, nsec := stat.Ctim.Unix()
-	return fmt.Sprintf("%d.%d", sec, nsec), nil
-}
-
 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
 }
 
-func writeDep(fdDep *os.File, cwd, tgt string) error {
-	trace(CDebug, "ifchange: %s <- %s", fdDep.Name(), tgt)
+func depWrite(fdDep *os.File, cwd, tgt, hsh string) error {
+	tracef(CDebug, "ifchange: %s <- %s", fdDep.Name(), tgt)
 	fd, err := os.Open(path.Join(cwd, tgt))
 	if err != nil {
 		return err
@@ -109,44 +100,58 @@ func writeDep(fdDep *os.File, cwd, tgt string) error {
 	if fi.IsDir() {
 		return nil
 	}
-	ts, err := fileCtime(fd)
+	inode, err := inodeFromFileByFd(fd)
 	if err != nil {
 		return err
 	}
-	hsh, err := fileHash(fd)
-	if err != nil {
-		return err
+	if hsh == "" {
+		hsh, err = fileHash(fd)
+		if err != nil {
+			return err
+		}
 	}
-	return recfileWrite(
-		fdDep,
-		recfile.Field{Name: "Type", Value: DepTypeIfchange},
-		recfile.Field{Name: "Target", Value: tgt},
-		recfile.Field{Name: "Ctime", Value: ts},
-		recfile.Field{Name: "Hash", Value: hsh},
-	)
+	fields := []recfile.Field{
+		{Name: "Type", Value: DepTypeIfchange},
+		{Name: "Target", Value: tgt},
+		{Name: "Hash", Value: hsh},
+	}
+	fields = append(fields, inode.RecfileFields()...)
+	return recfileWrite(fdDep, fields...)
 }
 
-func writeDeps(fdDep *os.File, tgts []string) error {
+func depsWrite(fdDep *os.File, tgts []string) error {
 	if fdDep == nil {
-		trace(CDebug, "no opened fdDep: %s", tgts)
+		tracef(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)
+		}
+		cwd := Cwd
+		if DepCwd != "" && Cwd != DepCwd {
+			cwd = DepCwd
+		}
+		tgtDir := path.Join(cwd, DirPrefix)
+		tgtRel, err := filepath.Rel(tgtDir, tgtAbs)
+		if err != nil {
+			panic(err)
+		}
+		if _, errStat := os.Stat(tgt); errStat == nil {
+			err = depWrite(fdDep, tgtDir, tgtRel, "")
 		} else {
-			trace(CDebug, "skipping dep record, can not stat: %s", tgt)
+			tracef(CDebug, "ifchange: %s <- %s (non-existing)", fdDep.Name(), tgtRel)
+			fields := []recfile.Field{
+				{Name: "Type", Value: DepTypeIfchange},
+				{Name: "Target", Value: tgtRel},
+			}
+			inodeDummy := Inode{}
+			fields = append(fields, inodeDummy.RecfileFields()...)
+			err = recfileWrite(fdDep, fields...)
+		}
+		if err != nil {
+			return err
 		}
 	}
 	return nil
@@ -160,22 +165,22 @@ type DepInfo struct {
 	ifchanges []map[string]string
 }
 
-func depRead(fdDep *os.File) (*DepInfo, error) {
+func depRead(fdDep io.Reader) (*DepInfo, error) {
 	r := recfile.NewReader(fdDep)
 	m, err := r.NextMap()
 	if err != nil {
 		return nil, err
 	}
 	depInfo := DepInfo{}
-	if b := m["Build"]; b == "" {
-		return nil, errors.New(".dep missing Build:")
-	} else {
-		depInfo.build = b
+	b := m["Build"]
+	if b == "" {
+		return nil, errors.New(".rec missing Build:")
 	}
+	depInfo.build = b
 	for {
 		m, err := r.NextMap()
 		if err != nil {
-			if err == io.EOF {
+			if errors.Is(err, io.EOF) {
 				break
 			}
 			return nil, err
@@ -186,7 +191,7 @@ func depRead(fdDep *os.File) (*DepInfo, error) {
 		case DepTypeIfcreate:
 			dep := m["Target"]
 			if dep == "" {
-				return nil, errors.New("invalid format of .dep")
+				return nil, ErrBadRecFormat
 			}
 			depInfo.ifcreates = append(depInfo.ifcreates, dep)
 		case DepTypeIfchange:
@@ -195,11 +200,11 @@ func depRead(fdDep *os.File) (*DepInfo, error) {
 		case DepTypeStamp:
 			hsh := m["Hash"]
 			if hsh == "" {
-				return nil, errors.New("invalid format of .dep")
+				return nil, ErrBadRecFormat
 			}
 			depInfo.stamp = hsh
 		default:
-			return nil, errors.New("invalid format of .dep")
+			return nil, ErrBadRecFormat
 		}
 	}
 	return &depInfo, nil