Shorter declaration

[goredo.git] / ood.go

diff --git a/ood.go b/ood.go
index b499041abe5edc91a0d859f590a9d23251d013ec..52be37be889f5074fd987948b5fdd5e9fa7e2d08 100644 (file)
--- a/ood.go
+++ b/ood.go
@@ -23,10 +23,10 @@ import (
        "errors"
        "fmt"
        "io"
+       "io/fs"
        "log"
        "os"
        "path"
-       "path/filepath"
        "strings"
 
        "golang.org/x/sys/unix"
@@ -47,8 +47,8 @@ var (
        FdOODTgts     *os.File
        FdOODTgtsLock *os.File
 
-       OODCache        map[string]bool = make(map[string]bool)
-       FileExistsCache map[string]bool = make(map[string]bool)
+       OODCache        = make(map[string]bool)
+       FileExistsCache = make(map[string]bool)
 
        ErrMissingTarget = errors.New("invalid format of .rec: missing Target")
 )
@@ -62,7 +62,7 @@ func FileExists(p string) bool {
                FileExistsCache[p] = true
                return true
        }
-       if os.IsNotExist(err) {
+       if errors.Is(err, fs.ErrNotExist) {
                FileExistsCache[p] = false
        }
        return false
@@ -79,23 +79,6 @@ func (e TgtError) Error() string {
        return fmt.Sprintf("%s: %s", e.Tgt, e.Err)
 }
 
-func cwdMustRel(paths ...string) string {
-       rel, err := filepath.Rel(Cwd, path.Join(paths...))
-       if err != nil {
-               panic(err)
-       }
-       return rel
-}
-
-func cwdAndTgt(tgt string) (string, string) {
-       cwd, tgt := path.Split(tgt)
-       cwd, err := filepath.Abs(cwd)
-       if err != nil {
-               panic(err)
-       }
-       return cwd, tgt
-}
-
 func isSrc(cwd, tgt string) bool {
        d, f := path.Split(path.Join(cwd, tgt))
        if !FileExists(path.Join(d, f)) {
@@ -150,7 +133,7 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
        depInfo, err := depRead(fdDep)
        fdDep.Close()
        if err != nil {
-               return true, TgtError{tgtOrig, err}
+               return true, TgtError{tgtOrig, ErrLine(err)}
        }
 
        if depInfo.build == BuildUUID {
@@ -194,13 +177,13 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 
                inode, err := inodeFromFileByPath(path.Join(cwd, dep))
                if err != nil {
-                       if os.IsNotExist(err) {
+                       if errors.Is(err, fs.ErrNotExist) {
                                tracef(CDebug, "ood: %s%s -> %s: not exists", indent, tgtOrig, dep)
                                ood = true
                                OODCache[path.Join(cwd, dep)] = ood
                                goto Done
                        }
-                       return ood, TgtError{tgtOrig, err}
+                       return ood, TgtError{tgtOrig, ErrLine(err)}
                }
 
                if inode.Size != theirInode.Size {
@@ -215,12 +198,12 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
                        tracef(CDebug, "ood: %s%s -> %s: inode differs", indent, tgtOrig, dep)
                        fd, err := os.Open(path.Join(cwd, dep))
                        if err != nil {
-                               return ood, TgtError{tgtOrig, err}
+                               return ood, TgtError{tgtOrig, ErrLine(err)}
                        }
                        hsh, err := fileHash(fd)
                        fd.Close()
                        if err != nil {
-                               return ood, TgtError{tgtOrig, err}
+                               return ood, TgtError{tgtOrig, ErrLine(err)}
                        }
                        if theirHsh != hsh {
                                tracef(CDebug, "ood: %s%s -> %s: hash differs", indent, tgtOrig, dep)
@@ -270,11 +253,9 @@ func isOODWithTrace(
        level int,
        seen map[string]struct{},
 ) (bool, error) {
-       p, err := filepath.Abs(path.Join(cwd, tgtOrig))
-       if err != nil {
-               panic(err)
-       }
+       p := mustAbs(path.Join(cwd, tgtOrig))
        _, ood := OODTgts[p]
+       var err error
        if ood {
                if !isOODByBuildUUID(cwd, tgtOrig) {
                        tracef(
@@ -301,17 +282,17 @@ RecordOODTgt:
                Whence: io.SeekStart,
        }
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLKW, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if _, err = FdOODTgts.Seek(0, io.SeekEnd); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if _, err := FdOODTgts.WriteString(p + "\x00"); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        flock.Type = unix.F_UNLCK
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLK, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        return true, nil
 }
@@ -323,13 +304,13 @@ func oodTgtsClear() {
                Whence: io.SeekStart,
        }
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLKW, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if err = FdOODTgts.Truncate(0); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        flock.Type = unix.F_UNLCK
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLK, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
 }