X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=dep.go;h=bbd7310171fb5d43183e544425f5676d91fe381d;hb=fa0728d6bc790672982ba006961077371d2b552d;hp=0f62d30243f0256e2a0be731de93f010be45052a;hpb=67e92d5a298516292bbbee1f7714708cdc0766f8;p=goredo.git

diff --git a/dep.go b/dep.go
index 0f62d30..bbd7310 100644
--- a/dep.go
+++ b/dep.go
@@ -1,6 +1,6 @@
 /*
-goredo -- redo implementation on pure Go
-Copyright (C) 2020 Sergey Matveev <stargrave@stargrave.org>
+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
 it under the terms of the GNU General Public License as published by
@@ -22,20 +22,17 @@ package main
 import (
 	"bufio"
 	"encoding/hex"
-	"fmt"
+	"errors"
 	"io"
 	"os"
 	"path"
-	"strings"
-	"syscall"
+	"path/filepath"
 
 	"go.cypherpunks.ru/recfile"
-	"golang.org/x/crypto/blake2b"
+	"lukechampine.com/blake3"
 )
 
-const EnvNoHash = "REDO_NO_HASH"
-
-var NoHash bool
+var DirPrefix string
 
 func recfileWrite(fdDep *os.File, fields ...recfile.Field) error {
 	w := recfile.NewWriter(fdDep)
@@ -76,22 +73,9 @@ func stamp(fdDep, src *os.File) error {
 	)
 }
 
-func fileCtime(fd *os.File) (string, error) {
-	fi, err := fd.Stat()
-	if err != nil {
-		return "", err
-	}
-	stat := fi.Sys().(*syscall.Stat_t)
-	sec, nsec := stat.Ctimespec.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
@@ -104,43 +88,110 @@ func writeDep(fdDep *os.File, cwd, tgt string) error {
 		return err
 	}
 	defer fd.Close()
-	ts, err := fileCtime(fd)
+	fi, err := fd.Stat()
 	if err != nil {
 		return err
 	}
-	fields := []recfile.Field{
-		recfile.Field{Name: "Type", Value: DepTypeIfchange},
-		recfile.Field{Name: "Target", Value: tgt},
-		recfile.Field{Name: "Ctime", Value: ts},
+	if fi.IsDir() {
+		return nil
 	}
-	var hsh string
-	if !NoHash {
-		hsh, err = fileHash(fd)
-		if err != nil {
-			return err
-		}
-		fields = append(fields, recfile.Field{Name: "Hash", Value: hsh})
+	inode, err := inodeFromFile(fd)
+	if err != nil {
+		return err
 	}
+	hsh, err := fileHash(fd)
+	if err != nil {
+		return err
+	}
+	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 writeDeps(fdDep *os.File, tgts []string) (err error) {
 	if fdDep == nil {
 		trace(CDebug, "no opened fdDep: %s", tgts)
 		return nil
 	}
-	ups := []string{}
-	upLevels := strings.Count(os.Getenv(EnvDirPrefix), "/")
-	for i := 0; i < upLevels; i++ {
-		ups = append(ups, "..")
-	}
-	up := path.Join(ups...)
 	for _, tgt := range tgts {
-		if _, err := os.Stat(tgt); err == nil {
-			if err = writeDep(fdDep, Cwd, path.Join(up, tgt)); 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, "ifchange: %s <- %s (unexisting)", 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...)
 		}
 	}
-	return nil
+	return
+}
+
+type DepInfo struct {
+	build     string
+	always    bool
+	stamp     string
+	ifcreates []string
+	ifchanges []map[string]string
+}
+
+func depRead(fdDep *os.File) (*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(".rec missing Build:")
+	} else {
+		depInfo.build = b
+	}
+	for {
+		m, err := r.NextMap()
+		if err != nil {
+			if err == io.EOF {
+				break
+			}
+			return nil, err
+		}
+		switch m["Type"] {
+		case DepTypeAlways:
+			depInfo.always = true
+		case DepTypeIfcreate:
+			dep := m["Target"]
+			if dep == "" {
+				return nil, errors.New("invalid format of .rec")
+			}
+			depInfo.ifcreates = append(depInfo.ifcreates, dep)
+		case DepTypeIfchange:
+			delete(m, "Type")
+			depInfo.ifchanges = append(depInfo.ifchanges, m)
+		case DepTypeStamp:
+			hsh := m["Hash"]
+			if hsh == "" {
+				return nil, errors.New("invalid format of .rec")
+			}
+			depInfo.stamp = hsh
+		default:
+			return nil, errors.New("invalid format of .rec")
+		}
+	}
+	return &depInfo, nil
 }