/*
-goredo -- redo implementation on pure Go
+goredo -- djb's redo implementation on pure Go
Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
This program is free software: you can redistribute it and/or modify
return os.MkdirAll(pth, os.FileMode(0777))
}
-func isModified(cwd, redoDir, tgt string) (bool, string, error) {
+func isModified(cwd, redoDir, tgt string) (bool, *Inode, error) {
fdDep, err := os.Open(path.Join(redoDir, tgt+DepSuffix))
if err != nil {
if os.IsNotExist(err) {
- return false, "", nil
+ return false, nil, nil
}
- return false, "", err
+ return false, nil, err
}
defer fdDep.Close()
r := recfile.NewReader(fdDep)
- var ourTs string
+ var ourInode *Inode
for {
m, err := r.NextMap()
if err != nil {
if err == io.EOF {
break
}
- return false, "", err
+ return false, nil, err
}
if m["Target"] != tgt {
continue
fd, err := os.Open(path.Join(cwd, tgt))
if err != nil {
if os.IsNotExist(err) {
- return false, "", nil
+ return false, nil, nil
}
- return false, "", err
+ return false, nil, err
}
- defer fd.Close()
- ourTs, err = fileCtime(fd)
+ ourInode, err = inodeFromFile(fd)
+ fd.Close()
if err != nil {
- return false, "", err
+ return false, nil, err
}
- if ourTs != m["Ctime"] {
- return true, ourTs, nil
+ theirInode, err := inodeFromRec(m)
+ if err != nil {
+ return false, nil, err
+ }
+ if !ourInode.Equals(theirInode) {
+ return true, ourInode, nil
}
break
}
- return false, ourTs, nil
+ return false, ourInode, nil
}
func syncDir(dir string) error {
}
// Check if target is not modified externally
- modified, tsPrev, err := isModified(cwd, redoDir, tgt)
+ modified, inodePrev, err := isModified(cwd, redoDir, tgt)
if err != nil {
lockRelease()
return TgtErr{tgtOrig, err}
}
// Determine basename and DIRPREFIX
+ doFileRelPath := doFile
ents := strings.Split(cwd, "/")
ents = ents[len(ents)-upLevels:]
dirPrefix := path.Join(ents...)
cwdOrig := cwd
for i := 0; i < upLevels; i++ {
cwd = path.Join(cwd, "..")
+ doFileRelPath = path.Join("..", doFileRelPath)
}
cwd = path.Clean(cwd)
doFilePath := path.Join(cwd, doFile)
runErr := RunErr{Tgt: tgtOrig}
if strings.HasPrefix(doFile, "default.") {
basename = tgt[:len(tgt)-(len(doFile)-len("default.")-len(".do"))-1]
- runErr.DoFile = doFile
+ runErr.DoFile = doFileRelPath
}
- if err = writeDep(fdDep, cwd, doFile); err != nil {
+ if err = writeDep(fdDep, cwdOrig, doFileRelPath); err != nil {
cleanup()
return TgtErr{tgtOrig, err}
}
cmd := exec.Command(cmdName, args...)
cmd.Dir = cwd
cmd.Stdout = fdStdout
+ // cmd.Stdin reads from /dev/null by default
cmd.Env = append(os.Environ(), fmt.Sprintf("%s=%d", EnvLevel, Level+1))
cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvDirPrefix, dirPrefix))
cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvBuildUUID, BuildUUID))
}
fdStderr.Truncate(0)
}
- shCtx := fmt.Sprintf("sh: %s: %s %s [%s]", tgtOrig, cmdName, args, cwd)
+ shCtx := fmt.Sprintf(
+ "sh: %s: %s %s cwd:%s dirprefix:%s",
+ tgtOrig, cmdName, args, cwd, dirPrefix,
+ )
trace(CDebug, "%s", shCtx)
Jobs.Add(1)
}
// Was $1 touched?
- if tsPrev != "" {
+ if inodePrev != nil {
if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
- ts, err := fileCtime(fd)
+ inode, err := inodeFromFile(fd)
fd.Close()
- if err == nil && ts != tsPrev {
+ if err == nil && !inode.Equals(inodePrev) {
runErr.Err = errors.New("$1 was explicitly touched")
errs <- runErr
- fd.Close()
return
}
}