X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=blobdiff_plain;f=targets.go;h=dca27f4e7880626a383b56852942f5435e890997;hp=5d2342e884ea68f6ac537b85b4dda1b29fcf73c4;hb=4631e48a3b576942454e5534cd269ff3f5c1a56d;hpb=3f41f01cde86ac9dab16b8c0c9b7128652907497 diff --git a/targets.go b/targets.go index 5d2342e..dca27f4 100644 --- a/targets.go +++ b/targets.go @@ -36,30 +36,30 @@ func targetsCollect(root string, tgts map[string]struct{}) error { } 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 } - 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 } - redoFis, err := redoDir.Readdir(0) + redoEntries, err := redoDir.ReadDir(0) redoDir.Close() if err != nil { return 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{}{}