Raise copyright years in advance

[goredo.git] / sources.go

diff --git a/sources.go b/sources.go
index 659df3a51d9ff76e352dcbc104b62e7d01a8be6b..98f77ce36c6f58b048880dcf07badbb8164b73e3 100644 (file)
--- a/sources.go
+++ b/sources.go
@@ -1,6 +1,6 @@
 /*
 goredo -- djb's redo implementation on pure Go
-Copyright (C) 2020-2023 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2020-2024 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
@@ -18,47 +18,44 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-       "log"
-       "os"
-       "path"
+       "errors"
+       "io/fs"
 )
 
-func sourcesWalker(tgts []string) ([]string, error) {
-       seen := make(map[string]struct{}, 1<<10)
+func sourcesWalker(
+       tgts []*Tgt,
+       seen map[string]struct{},
+       seenDeps map[string]struct{},
+       srcs map[string]*Tgt,
+) error {
        for _, tgt := range tgts {
-               tgtAbsPath := mustAbs(path.Join(Cwd, tgt))
-               cwd, f := path.Split(path.Join(Cwd, tgt))
-               fdDep, err := os.Open(path.Join(cwd, RedoDir, f+DepSuffix))
+               if _, ok := seenDeps[tgt.rel]; ok {
+                       continue
+               }
+               seenDeps[tgt.rel] = struct{}{}
+               dep, err := depRead(tgt)
                if err != nil {
-                       if os.IsNotExist(err) {
+                       if errors.Is(err, fs.ErrNotExist) {
                                continue
                        }
-                       return nil, ErrLine(err)
-               }
-               depInfo, err := depRead(fdDep)
-               fdDep.Close()
-               if err != nil {
-                       return nil, ErrLine(err)
+                       return ErrLine(err)
                }
-               for _, m := range depInfo.ifchanges {
-                       depTgt := m["Target"]
-                       depTgtAbsPath := mustAbs(path.Join(cwd, depTgt))
-                       if isSrc(cwd, depTgt) {
-                               seen[cwdMustRel(depTgtAbsPath)] = struct{}{}
-                       } else if depTgtAbsPath != tgtAbsPath {
-                               subSrcs, err := sourcesWalker([]string{cwdMustRel(depTgtAbsPath)})
-                               if err != nil {
-                                       log.Fatal(err)
-                               }
-                               for _, p := range subSrcs {
-                                       seen[p] = struct{}{}
+               for _, ifchange := range dep.ifchanges {
+                       if _, ok := seen[ifchange.tgt.rel]; ok {
+                               continue
+                       }
+                       seen[ifchange.tgt.rel] = struct{}{}
+                       if isSrc(ifchange.tgt) {
+                               srcs[ifchange.tgt.rel] = ifchange.tgt
+                       } else if ifchange.tgt.rel != tgt.rel {
+                               if err := sourcesWalker(
+                                       []*Tgt{ifchange.tgt},
+                                       seen, seenDeps, srcs,
+                               ); err != nil {
+                                       return err
                                }
                        }
                }
        }
-       srcs := make([]string, 0, len(seen))
-       for p := range seen {
-               srcs = append(srcs, p)
-       }
-       return srcs, nil
+       return nil
 }