/*
-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
"bufio"
"encoding/hex"
"errors"
- "fmt"
"io"
"os"
"path"
- "strings"
+ "path/filepath"
"go.cypherpunks.ru/recfile"
- "golang.org/x/crypto/blake2b"
- "golang.org/x/sys/unix"
+ "lukechampine.com/blake3"
)
-func recfileWrite(fdDep *os.File, fields ...recfile.Field) error {
+var (
+ DirPrefix string
+ DepCwd string
+
+ 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
}
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},
}
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},
)
}
-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
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
}
- 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)
+ }
+ 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 {
+ 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
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
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:
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