X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=dep.go;h=539ef5791e3011f53e84add54b50ee671b103f3d;hb=fe05b7986bf77bf30a9cdcf89d208013af5ed221;hp=d7c874a95ea4d845592611a8e85377e0722b6af3;hpb=fd3be6ccc0576edf0a74b9f312f8308482b7dd9c;p=goredo.git diff --git a/dep.go b/dep.go index d7c874a..539ef57 100644 --- a/dep.go +++ b/dep.go @@ -1,5 +1,5 @@ /* -goredo -- redo implementation on pure Go +goredo -- djb's redo implementation on pure Go Copyright (C) 2020-2021 Sergey Matveev This program is free software: you can redistribute it and/or modify @@ -23,20 +23,23 @@ import ( "bufio" "encoding/hex" "errors" - "fmt" "io" "os" "path" "path/filepath" "go.cypherpunks.ru/recfile" - "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,15 +78,6 @@ 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 := blake3.New(32, nil) if _, err := io.Copy(h, bufio.NewReader(fd)); err != nil { @@ -92,8 +86,8 @@ func fileHash(fd *os.File) (string, error) { 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 string) error { + tracef(CDebug, "ifchange: %s <- %s", fdDep.Name(), tgt) fd, err := os.Open(path.Join(cwd, tgt)) if err != nil { return err @@ -106,7 +100,7 @@ func writeDep(fdDep *os.File, cwd, tgt string) error { if fi.IsDir() { return nil } - ts, err := fileCtime(fd) + inode, err := inodeFromFile(fd) if err != nil { return err } @@ -114,18 +108,18 @@ func writeDep(fdDep *os.File, cwd, tgt string) error { 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) (err 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 { @@ -133,24 +127,32 @@ func writeDeps(fdDep *os.File, tgts []string) (err error) { if err != nil { panic(err) } - tgtDir := path.Join(Cwd, DirPrefix) + 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 = writeDep(fdDep, tgtDir, tgtRel) + err = depWrite(fdDep, tgtDir, tgtRel) } else { - trace(CDebug, "ifchange: %s <- %s (unexisting)", fdDep.Name(), tgtRel) - err = recfileWrite( - fdDep, - recfile.Field{Name: "Type", Value: DepTypeIfchange}, - recfile.Field{Name: "Target", Value: tgtRel}, - recfile.Field{Name: "Ctime", Value: "0.0"}, - ) + 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 + return nil } type DepInfo struct { @@ -161,22 +163,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 @@ -187,7 +189,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: @@ -196,11 +198,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