/*
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
package main
import (
- "errors"
"fmt"
- "io"
"os"
"path"
-
- "go.cypherpunks.ru/recfile"
)
type DotNodes struct {
to string
}
-func dotWalker(data map[DotNodes]bool, tgtOrig string) (map[DotNodes]bool, error) {
- cwd, tgt := cwdAndTgt(tgtOrig)
- depPath := path.Join(cwd, RedoDir, tgt+DepSuffix)
- fdDep, err := os.Open(depPath)
+func dotWalker(data map[DotNodes]bool, tgt *Tgt) (map[DotNodes]bool, error) {
+ raw, err := os.ReadFile(tgt.dep)
+ if err != nil {
+ return nil, ErrLine(err)
+ }
+ _, raw, err = depHeadParse(raw)
if err != nil {
- return nil, err
+ return nil, ErrLine(err)
}
- defer fdDep.Close()
- var dep string
- r := recfile.NewReader(fdDep)
- for {
- m, err := r.NextMap()
+ var typ byte
+ var name string
+ var dep *Tgt
+ var chunk []byte
+ tgtH, _ := pathSplit(tgt.a)
+ for len(raw) > 0 {
+ typ, chunk, raw, err = chunkRead(raw)
if err != nil {
- if errors.Is(err, io.EOF) {
- break
- }
- return nil, err
+ return nil, ErrLine(err)
}
- switch m["Type"] {
+ switch typ {
case DepTypeIfcreate:
- data[DotNodes{tgtOrig, cwdMustRel(cwd, m["Target"])}] = true
- case DepTypeIfchange:
- dep = m["Target"]
- data[DotNodes{tgtOrig, cwdMustRel(cwd, dep)}] = false
- if isSrc(cwd, dep) || dep == tgt {
+ data[DotNodes{tgt.rel, NewTgt(path.Join(tgtH, string(chunk))).rel}] = true
+ case DepTypeIfchange, DepTypeIfchangeNonex:
+ if typ == DepTypeIfchangeNonex {
+ name = string(chunk)
+ } else {
+ name = string(chunk[InodeLen+HashLen:])
+ }
+ dep = NewTgt(path.Join(tgtH, name))
+ if dep.a == tgt.a {
+ continue
+ }
+ data[DotNodes{tgt.rel, dep.rel}] = false
+ if isSrc(dep) {
continue
}
- data, err = dotWalker(data, cwdMustRel(cwd, dep))
+ data, err = dotWalker(data, dep)
if err != nil {
return nil, err
}
return data, nil
}
-func dotPrint(tgts []string) error {
+func dotPrint(tgts []*Tgt) error {
data := map[DotNodes]bool{}
var err error
for _, tgt := range tgts {