Do not use deprecated os.SEEK_*

[goredo.git] / dep.go

diff --git a/dep.go b/dep.go
index 897be43c6bd0ec3a5daae788331af9acd3351f0c..bbd7310171fb5d43183e544425f5676d91fe381d 100644 (file)
--- 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 <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
@@ -23,17 +23,17 @@ import (
        "bufio"
        "encoding/hex"
        "errors"
-       "fmt"
        "io"
        "os"
        "path"
-       "strings"
-       "syscall"
+       "path/filepath"
 
        "go.cypherpunks.ru/recfile"
-       "golang.org/x/crypto/blake2b"
+       "lukechampine.com/blake3"
 )
 
+var DirPrefix string
+
 func recfileWrite(fdDep *os.File, fields ...recfile.Field) error {
        w := recfile.NewWriter(fdDep)
        if _, err := w.RecordStart(); err != nil {
@@ -73,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
@@ -101,7 +88,14 @@ 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
+       }
+       if fi.IsDir() {
+               return nil
+       }
+       inode, err := inodeFromFile(fd)
        if err != nil {
                return err
        }
@@ -109,34 +103,44 @@ 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) 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 {
@@ -155,7 +159,7 @@ func depRead(fdDep *os.File) (*DepInfo, error) {
        }
        depInfo := DepInfo{}
        if b := m["Build"]; b == "" {
-               return nil, errors.New(".dep missing Build:")
+               return nil, errors.New(".rec missing Build:")
        } else {
                depInfo.build = b
        }
@@ -173,7 +177,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, errors.New("invalid format of .rec")
                        }
                        depInfo.ifcreates = append(depInfo.ifcreates, dep)
                case DepTypeIfchange:
@@ -182,11 +186,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, errors.New("invalid format of .rec")
                        }
                        depInfo.stamp = hsh
                default:
-                       return nil, errors.New("invalid format of .dep")
+                       return nil, errors.New("invalid format of .rec")
                }
        }
        return &depInfo, nil