"io"
"os"
"path"
- "strings"
- "syscall"
+ "path/filepath"
"go.cypherpunks.ru/recfile"
- "golang.org/x/crypto/blake2b"
+ "golang.org/x/sys/unix"
+ "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 {
}
func fileCtime(fd *os.File) (string, error) {
- fi, err := fd.Stat()
- if err != nil {
+ var stat unix.Stat_t
+ if err := unix.Fstat(int(fd.Fd()), &stat); err != nil {
return "", err
}
- stat := fi.Sys().(*syscall.Stat_t)
- sec, nsec := stat.Ctimespec.Unix()
+ 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
return err
}
defer fd.Close()
+ fi, err := fd.Stat()
+ if err != nil {
+ return err
+ }
+ if fi.IsDir() {
+ return nil
+ }
ts, err := fileCtime(fd)
if err != nil {
return err
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 {
+ 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 err = writeDep(fdDep, tgtDir, tgtRel); err != nil {
return err
}
+ } else {
+ trace(CDebug, "skipping dep record, can not stat: %s", tgt)
}
}
return nil