Empty target names must not be present in .rec

[goredo.git] / dep.go

diff --git a/dep.go b/dep.go
index 0e4f24fb0a1ef8872145d2715271f8eb5cff8adc..6644ac54695674cc8c8ad539a1e17ecadc37f7b5 100644 (file)
--- a/dep.go
+++ b/dep.go
@@ -1,6 +1,6 @@
 /*
 goredo -- djb's redo implementation on pure Go
-Copyright (C) 2020-2022 Sergey Matveev <stargrave@stargrave.org>
+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
@@ -21,12 +21,13 @@ package main
 
 import (
        "bufio"
+       "bytes"
        "encoding/hex"
        "errors"
        "io"
+       "log"
        "os"
        "path"
-       "path/filepath"
 
        "go.cypherpunks.ru/recfile"
        "lukechampine.com/blake3"
@@ -65,55 +66,50 @@ func always(fdDep *os.File) error {
 }
 
 func stamp(fdDep, src *os.File) error {
-       var hsh string
        hsh, err := fileHash(src)
        if err != nil {
                return err
        }
-       tracef(CDebug, "stamp: %s <- %s", fdDep.Name(), hsh)
+       tracef(CDebug, "stamp: %s <- %s", fdDep.Name(), hex.EncodeToString(hsh))
        return recfileWrite(
                fdDep,
                recfile.Field{Name: "Type", Value: DepTypeStamp},
-               recfile.Field{Name: "Hash", Value: hsh},
+               recfile.Field{Name: "Hash", Value: hex.EncodeToString(hsh)},
        )
 }
 
-func fileHash(fd *os.File) (string, error) {
+func fileHash(fd *os.File) ([]byte, error) {
        h := blake3.New(32, nil)
        if _, err := io.Copy(h, bufio.NewReader(fd)); err != nil {
-               return "", err
+               return nil, err
        }
-       return hex.EncodeToString(h.Sum(nil)), nil
+       return h.Sum(nil), nil
 }
 
-func depWrite(fdDep *os.File, cwd, tgt, hsh string) error {
+func depWrite(fdDep *os.File, cwd, tgt string, hsh []byte) error {
        tracef(CDebug, "ifchange: %s <- %s", fdDep.Name(), tgt)
        fd, err := os.Open(path.Join(cwd, tgt))
        if err != nil {
-               return err
+               return ErrLine(err)
        }
        defer fd.Close()
-       fi, err := fd.Stat()
+       inode, isDir, err := inodeFromFileByFd(fd)
        if err != nil {
-               return err
+               return ErrLine(err)
        }
-       if fi.IsDir() {
+       if isDir {
                return nil
        }
-       inode, err := inodeFromFile(fd)
-       if err != nil {
-               return err
-       }
-       if hsh == "" {
+       if hsh == nil {
                hsh, err = fileHash(fd)
                if err != nil {
-                       return err
+                       return ErrLine(err)
                }
        }
        fields := []recfile.Field{
                {Name: "Type", Value: DepTypeIfchange},
                {Name: "Target", Value: tgt},
-               {Name: "Hash", Value: hsh},
+               {Name: "Hash", Value: hex.EncodeToString(hsh)},
        }
        fields = append(fields, inode.RecfileFields()...)
        return recfileWrite(fdDep, fields...)
@@ -124,22 +120,17 @@ func depsWrite(fdDep *os.File, tgts []string) error {
                tracef(CDebug, "no opened fdDep: %s", tgts)
                return nil
        }
+       var err error
        for _, tgt := range tgts {
-               tgtAbs, err := filepath.Abs(tgt)
-               if err != nil {
-                       panic(err)
-               }
+               tgtAbs := mustAbs(tgt)
                cwd := Cwd
                if DepCwd != "" && Cwd != DepCwd {
                        cwd = DepCwd
                }
                tgtDir := path.Join(cwd, DirPrefix)
-               tgtRel, err := filepath.Rel(tgtDir, tgtAbs)
-               if err != nil {
-                       panic(err)
-               }
+               tgtRel := mustRel(tgtDir, tgtAbs)
                if _, errStat := os.Stat(tgt); errStat == nil {
-                       err = depWrite(fdDep, tgtDir, tgtRel, "")
+                       err = ErrLine(depWrite(fdDep, tgtDir, tgtRel, nil))
                } else {
                        tracef(CDebug, "ifchange: %s <- %s (non-existing)", fdDep.Name(), tgtRel)
                        fields := []recfile.Field{
@@ -148,7 +139,7 @@ func depsWrite(fdDep *os.File, tgts []string) error {
                        }
                        inodeDummy := Inode{}
                        fields = append(fields, inodeDummy.RecfileFields()...)
-                       err = recfileWrite(fdDep, fields...)
+                       err = ErrLine(recfileWrite(fdDep, fields...))
                }
                if err != nil {
                        return err
@@ -157,16 +148,36 @@ func depsWrite(fdDep *os.File, tgts []string) error {
        return nil
 }
 
+type DepInfoIfchange struct {
+       tgt   string
+       inode *Inode
+       hash  []byte
+}
+
 type DepInfo struct {
        build     string
        always    bool
-       stamp     string
+       stamp     []byte
        ifcreates []string
-       ifchanges []map[string]string
+       ifchanges []DepInfoIfchange
 }
 
-func depRead(fdDep io.Reader) (*DepInfo, error) {
-       r := recfile.NewReader(fdDep)
+func mustHexDecode(s string) []byte {
+       b, err := hex.DecodeString(s)
+       if err != nil {
+               log.Fatal(err)
+       }
+       return b
+}
+
+var missingBuild = errors.New(".rec missing Build:")
+
+func depRead(pth string) (*DepInfo, error) {
+       data, err := os.ReadFile(pth)
+       if err != nil {
+               return nil, err
+       }
+       r := recfile.NewReader(bytes.NewReader(data))
        m, err := r.NextMap()
        if err != nil {
                return nil, err
@@ -174,7 +185,7 @@ func depRead(fdDep io.Reader) (*DepInfo, error) {
        depInfo := DepInfo{}
        b := m["Build"]
        if b == "" {
-               return nil, errors.New(".rec missing Build:")
+               return nil, missingBuild
        }
        depInfo.build = b
        for {
@@ -195,17 +206,46 @@ func depRead(fdDep io.Reader) (*DepInfo, error) {
                        }
                        depInfo.ifcreates = append(depInfo.ifcreates, dep)
                case DepTypeIfchange:
-                       delete(m, "Type")
-                       depInfo.ifchanges = append(depInfo.ifchanges, m)
+                       dep := m["Target"]
+                       if dep == "" {
+                               return nil, ErrBadRecFormat
+                       }
+                       inode, err := inodeFromRec(m)
+                       if err != nil {
+                               log.Print(err)
+                               return nil, ErrBadRecFormat
+                       }
+                       hsh := mustHexDecode(m["Hash"])
+                       depInfo.ifchanges = append(depInfo.ifchanges, DepInfoIfchange{
+                               tgt: dep, inode: inode, hash: hsh,
+                       })
                case DepTypeStamp:
                        hsh := m["Hash"]
                        if hsh == "" {
                                return nil, ErrBadRecFormat
                        }
-                       depInfo.stamp = hsh
+                       depInfo.stamp = mustHexDecode(hsh)
                default:
                        return nil, ErrBadRecFormat
                }
        }
        return &depInfo, nil
 }
+
+func depReadBuild(pth string) (string, error) {
+       fd, err := os.Open(pth)
+       if err != nil {
+               return "", err
+       }
+       r := recfile.NewReader(fd)
+       m, err := r.NextMap()
+       fd.Close()
+       if err != nil {
+               return "", err
+       }
+       build := m["Build"]
+       if build == "" {
+               err = missingBuild
+       }
+       return build, err
+}