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

diff --git a/run.go b/run.go
index 4724870..2fed7cf 100644
--- a/run.go
+++ b/run.go
@@ -1,5 +1,5 @@
 /*
-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
@@ -101,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
@@ -126,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
 		}
-		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 {
@@ -222,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}
@@ -327,6 +331,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 	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))
@@ -461,11 +466,11 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		}
 
 		// 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()