if fi.IsDir() {
return nil
}
- inode, err := inodeFromFile(fd)
+ inode, err := inodeFromFileByFd(fd)
if err != nil {
return err
}
}
return err
}
- inode, err := inodeFromFile(fd)
+ inode, err := inodeFromFileByFd(fd)
if err != nil {
fd.Close()
return err
}
}
-func inodeFromFile(fd *os.File) (*Inode, error) {
- var fi os.FileInfo
+func inodeFromFileStat(fi os.FileInfo, stat unix.Stat_t) *Inode {
+ ctimeSec, ctimeNsec := stat.Ctim.Unix()
+ mtimeSec := fi.ModTime().Unix()
+ mtimeNsec := fi.ModTime().UnixNano()
+ return &Inode{
+ Size: fi.Size(),
+ InodeNum: uint64(stat.Ino),
+ CtimeSec: ctimeSec, CtimeNsec: ctimeNsec,
+ MtimeSec: mtimeSec, MtimeNsec: mtimeNsec,
+ }
+}
+
+func inodeFromFileByFd(fd *os.File) (*Inode, error) {
fi, err := fd.Stat()
if err != nil {
return nil, err
if err != nil {
return nil, err
}
- ctimeSec, ctimeNsec := stat.Ctim.Unix()
- mtimeSec := fi.ModTime().Unix()
- mtimeNsec := fi.ModTime().UnixNano()
- return &Inode{
- Size: fi.Size(),
- InodeNum: uint64(stat.Ino),
- CtimeSec: ctimeSec, CtimeNsec: ctimeNsec,
- MtimeSec: mtimeSec, MtimeNsec: mtimeNsec,
- }, nil
+ return inodeFromFileStat(fi, stat), nil
+}
+
+func inodeFromFileByPath(p string) (*Inode, error) {
+ fi, err := os.Stat(p)
+ if err != nil {
+ return nil, err
+ }
+ var stat unix.Stat_t
+ err = unix.Stat(p, &stat)
+ if err != nil {
+ return nil, err
+ }
+ return inodeFromFileStat(fi, stat), nil
}
func inodeFromRec(m map[string]string) (*Inode, error) {
theirHsh := m["Hash"]
tracef(CDebug, "ood: %s%s -> %s: checking", indent, tgtOrig, dep)
- fd, err := os.Open(path.Join(cwd, dep))
+ inode, err := inodeFromFileByPath(path.Join(cwd, dep))
if err != nil {
if os.IsNotExist(err) {
tracef(CDebug, "ood: %s%s -> %s: not exists", indent, tgtOrig, dep)
}
return ood, TgtError{tgtOrig, err}
}
- defer fd.Close()
- inode, err := inodeFromFile(fd)
- if err != nil {
- return ood, TgtError{tgtOrig, err}
- }
if inode.Size != theirInode.Size {
tracef(CDebug, "ood: %s%s -> %s: size differs", indent, tgtOrig, dep)
ood = true
tracef(CDebug, "ood: %s%s -> %s: same inode", indent, tgtOrig, dep)
} else {
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}
+ }
hsh, err := fileHash(fd)
+ fd.Close()
if err != nil {
return ood, TgtError{tgtOrig, err}
}
}
tracef(CDebug, "ood: %s%s -> %s: same hash", indent, tgtOrig, dep)
}
- fd.Close()
if dep == tgt {
tracef(CDebug, "ood: %s%s -> %s: same target", indent, tgtOrig, dep)
if m["Type"] != DepTypeIfchange || m["Target"] != tgt {
continue
}
- fd, err := os.Open(path.Join(cwd, tgt))
+ ourInode, err = inodeFromFileByPath(path.Join(cwd, tgt))
if err != nil {
if os.IsNotExist(err) {
return false, nil, "", nil
}
return false, nil, "", err
}
- ourInode, err = inodeFromFile(fd)
- fd.Close()
- if err != nil {
- return false, nil, "", err
- }
theirInode, err := inodeFromRec(m)
if err != nil {
return false, nil, "", err
}
// Was $1 touched?
- if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
+ if inode, err := inodeFromFileByPath(path.Join(cwdOrig, tgt)); err == nil {
if inodePrev == nil {
- fd.Close()
runErr.Err = Err1WasTouched
errs <- runErr
return
}
- inode, err := inodeFromFile(fd)
- fd.Close()
if err != nil {
runErr.Err = err
errs <- runErr
}
if inodePrev != nil {
- if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
- inode, err := inodeFromFile(fd)
- fd.Close()
- if err == nil && !inode.Equals(inodePrev) {
+ if inode, err := inodeFromFileByPath(path.Join(cwdOrig, tgt)); err == nil {
+ if !inode.Equals(inodePrev) {
runErr.Err = Err1WasTouched
errs <- runErr
return