Download link for 0.10.0 release

[goredo.git] / dep.go

diff --git a/dep.go b/dep.go
index e6663e65fb7afaa64dac6f435a6b633d70ff9625..df5ae27f2af9737b070b84df719a24f255328d2b 100644 (file)
--- a/dep.go
+++ b/dep.go
@@ -1,6 +1,6 @@
 /*
 goredo -- redo implementation on pure Go
-Copyright (C) 2020 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2020-2021 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
@@ -27,13 +27,15 @@ import (
        "io"
        "os"
        "path"
-       "strings"
-       "syscall"
+       "path/filepath"
 
        "go.cypherpunks.ru/recfile"
        "golang.org/x/crypto/blake2b"
+       "golang.org/x/sys/unix"
 )
 
+var DirPrefix string
+
 func recfileWrite(fdDep *os.File, fields ...recfile.Field) error {
        w := recfile.NewWriter(fdDep)
        if _, err := w.RecordStart(); err != nil {
@@ -74,12 +76,11 @@ func stamp(fdDep, src *os.File) error {
 }
 
 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
 }
 
@@ -101,6 +102,13 @@ func writeDep(fdDep *os.File, cwd, tgt string) error {
                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
@@ -123,17 +131,22 @@ func writeDeps(fdDep *os.File, tgts []string) error {
                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