}
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
}
var pth string
- for _, fi := range fis {
- pth = cwdMustRel(root, fi.Name())
+ for _, entry := range entries {
+ pth = cwdMustRel(root, entry.Name())
switch what {
case CleanupLog:
- if strings.HasSuffix(fi.Name(), LogSuffix) ||
- strings.HasSuffix(fi.Name(), LogRecSuffix) {
+ if strings.HasSuffix(entry.Name(), LogSuffix) ||
+ strings.HasSuffix(entry.Name(), LogRecSuffix) {
fmt.Println(pth)
if !*DryRun {
if err = os.Remove(pth); err != nil {
}
}
case CleanupLock:
- if strings.HasSuffix(fi.Name(), LockSuffix) {
+ if strings.HasSuffix(entry.Name(), LockSuffix) {
fmt.Println(pth)
if !*DryRun {
if err = os.Remove(pth); err != nil {
}
}
case CleanupTmp:
- if strings.HasPrefix(fi.Name(), TmpPrefix) {
+ if strings.HasPrefix(entry.Name(), TmpPrefix) {
fmt.Println(pth)
if !*DryRun {
if err = os.Remove(pth); err != nil {
}
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 {
- pth := path.Join(root, fi.Name())
- pthRel := cwdMustRel(root, fi.Name())
- if fi.IsDir() {
- if fi.Name() == RedoDir {
+ for _, entry := range entries {
+ pth := path.Join(root, entry.Name())
+ pthRel := cwdMustRel(root, entry.Name())
+ if entry.IsDir() {
+ if entry.Name() == RedoDir {
if what == CleanupFull {
fmt.Println(pthRel)
if !*DryRun {
err = redoDirClean(pth, what)
}
} else if (what == CleanupTmp || what == CleanupFull) &&
- strings.HasPrefix(fi.Name(), TmpPrefix) {
+ strings.HasPrefix(entry.Name(), TmpPrefix) {
fmt.Println(pthRel)
if !*DryRun {
err = os.RemoveAll(pth)
continue
}
if (what == CleanupTmp || what == CleanupFull) &&
- strings.HasPrefix(fi.Name(), TmpPrefix) {
+ strings.HasPrefix(entry.Name(), TmpPrefix) {
fmt.Println(pthRel)
if !*DryRun {
if err = os.Remove(pth); err != nil {
}
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() {
- if err = depFix(path.Join(root, fi.Name())); err != nil {
+ for _, entry := range entries {
+ if entry.IsDir() {
+ if err = depFix(path.Join(root, entry.Name())); err != nil {
return err
}
}
defer dir.Close()
redoDirChanged := false
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 !strings.HasSuffix(fi.Name(), DepSuffix) {
+ for _, entry := range entries {
+ if !strings.HasSuffix(entry.Name(), DepSuffix) {
continue
}
- tracef(CDebug, "depfix: checking %s/%s", root, fi.Name())
- fdDepPath := path.Join(redoDir, fi.Name())
+ tracef(CDebug, "depfix: checking %s/%s", root, entry.Name())
+ fdDepPath := path.Join(redoDir, entry.Name())
fdDep, err := os.Open(fdDepPath)
if err != nil {
return err
if dep == "" {
return ErrMissingTarget
}
- tracef(CDebug, "depfix: checking %s/%s -> %s", root, fi.Name(), dep)
+ tracef(CDebug, "depfix: checking %s/%s -> %s", root, entry.Name(), dep)
theirInode, err := inodeFromRec(m)
if err != nil {
return err
if os.IsNotExist(err) {
tracef(
CDebug, "depfix: %s/%s -> %s: not exists",
- root, fi.Name(), dep,
+ root, entry.Name(), dep,
)
continue
}
if inode.Size != theirInode.Size {
tracef(
CDebug, "depfix: %s/%s -> %s: size differs",
- root, fi.Name(), dep,
+ root, entry.Name(), dep,
)
fd.Close()
continue
if inode.Equals(theirInode) {
tracef(
CDebug, "depfix: %s/%s -> %s: inode is equal",
- root, fi.Name(), dep,
+ root, entry.Name(), dep,
)
fd.Close()
continue
if hsh != theirHsh {
tracef(
CDebug, "depfix: %s/%s -> %s: hash differs",
- root, fi.Name(), dep,
+ root, entry.Name(), dep,
)
continue
}
fieldses[len(fieldses)-1] = fields
tracef(
CDebug, "depfix: %s/%s -> %s: inode updated",
- root, fi.Name(), dep,
+ root, entry.Name(), dep,
)
depChanged = true
}
continue
}
redoDirChanged = true
- fdDep, err = tempfile(redoDir, fi.Name())
+ fdDep, err = tempfile(redoDir, entry.Name())
if err != nil {
return err
}
defer fdDep.Close()
tracef(
CDebug, "depfix: %s/%s: tmp %s",
- root, fi.Name(), fdDep.Name(),
+ root, entry.Name(), fdDep.Name(),
)
w := recfile.NewWriter(fdDep)
if _, err := w.WriteFields(fieldses[0]...); err != nil {
}
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{}{}