DRY filepath.Abs/Rel

[goredo.git] / dep.go

diff --git a/dep.go b/dep.go
index bf5e75809a3e985e5e950da10b5ff135db4d8cd3..9792cb0bbcd5b40a6289cdcdccc109ffd6fd7b92 100644 (file)
--- a/dep.go
+++ b/dep.go
@@ -1,6 +1,6 @@
 /*
 goredo -- djb's redo implementation on pure Go
-Copyright (C) 2020-2021 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
@@ -26,7 +26,6 @@ import (
        "io"
        "os"
        "path"
-       "path/filepath"
 
        "go.cypherpunks.ru/recfile"
        "lukechampine.com/blake3"
@@ -86,11 +85,11 @@ func fileHash(fd *os.File) (string, error) {
        return hex.EncodeToString(h.Sum(nil)), nil
 }
 
-func writeDep(fdDep *os.File, cwd, tgt string) error {
+func depWrite(fdDep *os.File, cwd, tgt, hsh string) error {
        tracef(CDebug, "ifchange: %s <- %s", fdDep.Name(), tgt)
        fd, err := os.Open(path.Join(cwd, tgt))
        if err != nil {
-               return err
+               return ErrLine(err)
        }
        defer fd.Close()
        fi, err := fd.Stat()
@@ -100,13 +99,15 @@ func writeDep(fdDep *os.File, cwd, tgt string) error {
        if fi.IsDir() {
                return nil
        }
-       inode, err := inodeFromFile(fd)
+       inode, err := inodeFromFileByFd(fd)
        if err != nil {
                return err
        }
-       hsh, err := fileHash(fd)
-       if err != nil {
-               return err
+       if hsh == "" {
+               hsh, err = fileHash(fd)
+               if err != nil {
+                       return ErrLine(err)
+               }
        }
        fields := []recfile.Field{
                {Name: "Type", Value: DepTypeIfchange},
@@ -117,27 +118,22 @@ func writeDep(fdDep *os.File, cwd, tgt string) error {
        return recfileWrite(fdDep, fields...)
 }
 
-func writeDeps(fdDep *os.File, tgts []string) error {
+func depsWrite(fdDep *os.File, tgts []string) error {
        if fdDep == nil {
                tracef(CDebug, "no opened fdDep: %s", tgts)
                return nil
        }
+       var err error
        for _, tgt := range tgts {
-               tgtAbs, err := filepath.Abs(tgt)
-               if err != nil {
-                       panic(err)
-               }
+               tgtAbs := mustAbs(tgt)
                cwd := Cwd
                if DepCwd != "" && Cwd != DepCwd {
                        cwd = DepCwd
                }
                tgtDir := path.Join(cwd, DirPrefix)
-               tgtRel, err := filepath.Rel(tgtDir, tgtAbs)
-               if err != nil {
-                       panic(err)
-               }
+               tgtRel := mustRel(tgtDir, tgtAbs)
                if _, errStat := os.Stat(tgt); errStat == nil {
-                       err = writeDep(fdDep, tgtDir, tgtRel)
+                       err = ErrLine(depWrite(fdDep, tgtDir, tgtRel, ""))
                } else {
                        tracef(CDebug, "ifchange: %s <- %s (non-existing)", fdDep.Name(), tgtRel)
                        fields := []recfile.Field{
@@ -146,7 +142,7 @@ func writeDeps(fdDep *os.File, tgts []string) error {
                        }
                        inodeDummy := Inode{}
                        fields = append(fields, inodeDummy.RecfileFields()...)
-                       err = recfileWrite(fdDep, fields...)
+                       err = ErrLine(recfileWrite(fdDep, fields...))
                }
                if err != nil {
                        return err