Optimise redo-sources

[goredo.git] / targets.go

diff --git a/targets.go b/targets.go
index af4e4dae9326410a9d0754bcb7851e53f5605e30..6459a2db5529d9061ce393b044073f62e9c2ba71 100644 (file)
--- a/targets.go
+++ b/targets.go
@@ -1,6 +1,6 @@
 /*
 goredo -- djb's redo implementation on pure Go
-Copyright (C) 2020-2022 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
@@ -21,50 +21,46 @@ import (
        "io"
        "os"
        "path"
-       "path/filepath"
        "strings"
 )
 
 func targetsCollect(root string, tgts map[string]struct{}) error {
-       root, err := filepath.Abs(root)
-       if err != nil {
-               panic(err)
-       }
+       root = mustAbs(root)
        dir, err := os.Open(root)
        if err != nil {
-               return err
+               return ErrLine(err)
        }
        defer dir.Close()
        for {
-               fis, err := dir.Readdir(1 << 10)
+               entries, err := dir.ReadDir(1 << 10)
                if err != nil {
                        if err == io.EOF {
                                break
                        }
-                       return err
+                       return ErrLine(err)
                }
-               for _, fi := range fis {
-                       if !fi.IsDir() {
+               for _, entry := range entries {
+                       if !entry.IsDir() {
                                continue
                        }
-                       pth := path.Join(root, fi.Name())
-                       if fi.Name() == RedoDir {
+                       pth := path.Join(root, entry.Name())
+                       if entry.Name() == RedoDir {
                                redoDir, err := os.Open(pth)
                                if err != nil {
-                                       return err
+                                       return ErrLine(err)
                                }
-                               redoFis, err := redoDir.Readdir(0)
+                               redoEntries, err := redoDir.ReadDir(0)
+                               redoDir.Close()
                                if err != nil {
-                                       return err
+                                       return ErrLine(err)
                                }
-                               for _, redoFi := range redoFis {
-                                       name := redoFi.Name()
+                               for _, redoEntry := range redoEntries {
+                                       name := redoEntry.Name()
                                        if strings.HasSuffix(name, DepSuffix) {
                                                name = cwdMustRel(root, name)
                                                tgts[name[:len(name)-len(DepSuffix)]] = struct{}{}
                                        }
                                }
-                               redoDir.Close()
                        } else {
                                if err = targetsCollect(pth, tgts); err != nil {
                                        return err
@@ -72,7 +68,7 @@ func targetsCollect(root string, tgts map[string]struct{}) error {
                        }
                }
        }
-       return dir.Close()
+       return nil
 }
 
 func targetsWalker(tgts []string) ([]string, error) {