X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=run.go;h=2fed7cf10824b9ae19912c0b3bb5e56929b7dbf4;hb=9e1cd5bf6c54ecad62b38a4f9eb2192e2924e46c;hp=c85543a0f8d7b4897bfc1ee65f69ef3b87200c82;hpb=db81599c97bdc51c5fd1edfabc4840438a26029a;p=goredo.git

diff --git a/run.go b/run.go
index c85543a..2fed7cf 100644
--- a/run.go
+++ b/run.go
@@ -1,6 +1,6 @@
 /*
-goredo -- redo implementation on pure Go
-Copyright (C) 2020 Sergey Matveev <stargrave@stargrave.org>
+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
 it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@ import (
 	"os"
 	"os/exec"
 	"path"
+	"path/filepath"
 	"strings"
 	"sync"
 	"syscall"
@@ -76,8 +77,6 @@ type RunErr struct {
 	Err      error
 }
 
-func (e RunErr) Unwrap() error { return e.Err }
-
 func (e *RunErr) Name() string {
 	var name string
 	if e.DoFile == "" {
@@ -102,24 +101,24 @@ func mkdirs(pth string) error {
 	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
@@ -127,21 +126,25 @@ func isModified(cwd, redoDir, tgt string) (bool, string, error) {
 		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
+		}
+		ourInode, err = inodeFromFile(fd)
+		fd.Close()
+		if err != nil {
+			return false, nil, err
 		}
-		defer fd.Close()
-		ourTs, err = fileCtime(fd)
+		theirInode, err := inodeFromRec(m)
 		if err != nil {
-			return false, "", err
+			return false, nil, err
 		}
-		if ourTs != m["Ctime"] {
-			return true, ourTs, nil
+		if !ourInode.Equals(theirInode) {
+			return true, ourInode, nil
 		}
 		break
 	}
-	return false, ourTs, nil
+	return false, ourInode, nil
 }
 
 func syncDir(dir string) error {
@@ -223,7 +226,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) 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}
@@ -267,12 +270,14 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 	}
 
 	// 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)
@@ -280,10 +285,10 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 	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}
 	}
@@ -306,17 +311,27 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 	}
 
 	// Temporary file for stdout
-	fdStdout, err := tempfile(cwd, tgt)
+	fdStdout, err := tempfile(cwdOrig, tgt)
 	if err != nil {
 		cleanup()
 		return TgtErr{tgtOrig, err}
 	}
 	tmpPath := fdStdout.Name() + ".3" // and for $3
-	args = append(args, tgt, basename, path.Base(tmpPath))
+	tmpPathRel, err := filepath.Rel(cwd, tmpPath)
+	if err != nil {
+		panic(err)
+	}
+	args = append(
+		args,
+		path.Join(dirPrefix, tgt),
+		path.Join(dirPrefix, basename),
+		tmpPathRel,
+	)
 
 	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))
@@ -369,7 +384,10 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		}
 		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)
@@ -448,14 +466,16 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		}
 
 		// Was $1 touched?
-		if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
-			ts, err := fileCtime(fd)
-			fd.Close()
-			if err == nil && ts != tsPrev {
-				runErr.Err = errors.New("$1 was explicitly touched")
-				errs <- runErr
+		if inodePrev != nil {
+			if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
+				inode, err := inodeFromFile(fd)
 				fd.Close()
-				return
+				if err == nil && !inode.Equals(inodePrev) {
+					runErr.Err = errors.New("$1 was explicitly touched")
+					errs <- runErr
+					fd.Close()
+					return
+				}
 			}
 		}
 
@@ -495,6 +515,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 
 		// Do we need to ifcreate it, of ifchange with renaming?
 		if fd == nil {
+			os.Remove(path.Join(cwdOrig, tgt))
 			err = ifcreate(fdDep, tgt)
 			if err != nil {
 				goto Finish