Optimise redo-sources

[goredo.git] / dep.go

diff --git a/dep.go b/dep.go
index 9792cb0bbcd5b40a6289cdcdccc109ffd6fd7b92..40245196c4b7a7a649eeabdbbac6c2ac9fe2cbaf 100644 (file)
--- a/dep.go
+++ b/dep.go
@@ -92,17 +92,13 @@ func depWrite(fdDep *os.File, cwd, tgt, hsh string) error {
                return ErrLine(err)
        }
        defer fd.Close()
-       fi, err := fd.Stat()
+       inode, isDir, err := inodeFromFileByFd(fd)
        if err != nil {
-               return err
+               return ErrLine(err)
        }
-       if fi.IsDir() {
+       if isDir {
                return nil
        }
-       inode, err := inodeFromFileByFd(fd)
-       if err != nil {
-               return err
-       }
        if hsh == "" {
                hsh, err = fileHash(fd)
                if err != nil {
@@ -159,6 +155,8 @@ type DepInfo struct {
        ifchanges []map[string]string
 }
 
+var missingBuild = errors.New(".rec missing Build:")
+
 func depRead(fdDep io.Reader) (*DepInfo, error) {
        r := recfile.NewReader(fdDep)
        m, err := r.NextMap()
@@ -168,7 +166,7 @@ func depRead(fdDep io.Reader) (*DepInfo, error) {
        depInfo := DepInfo{}
        b := m["Build"]
        if b == "" {
-               return nil, errors.New(".rec missing Build:")
+               return nil, missingBuild
        }
        depInfo.build = b
        for {
@@ -203,3 +201,21 @@ func depRead(fdDep io.Reader) (*DepInfo, error) {
        }
        return &depInfo, nil
 }
+
+func depReadBuild(pth string) (string, error) {
+       fd, err := os.Open(pth)
+       if err != nil {
+               return "", err
+       }
+       r := recfile.NewReader(fd)
+       m, err := r.NextMap()
+       fd.Close()
+       if err != nil {
+               return "", err
+       }
+       build := m["Build"]
+       if build == "" {
+               err = missingBuild
+       }
+       return build, err
+}