X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=main.go;h=f87bdac0d7f97295c88664af3706c20211e2f5be;hb=0030b3e73152bf9d9ad3e435fa42e607c7865321;hp=c3b1be78677b731291db45ca8af4cfab7b74a5d3;hpb=9485b9805119a388f1d4d93d18b0fe1a2da212a0;p=goredo.git

diff --git a/main.go b/main.go
index c3b1be7..f87bdac 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,6 @@
 /*
 goredo -- djb's redo implementation on pure Go
-Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2020-2022 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
@@ -21,6 +21,7 @@ import (
 	"bufio"
 	"bytes"
 	"crypto/rand"
+	"errors"
 	"flag"
 	"fmt"
 	"io"
@@ -62,8 +63,8 @@ var (
 	IsTopRedo bool // is it the top redo instance
 )
 
-func mustSetenv(key, value string) {
-	if err := os.Setenv(key, value); err != nil {
+func mustSetenv(key string) {
+	if err := os.Setenv(key, "1"); err != nil {
 		panic(err)
 	}
 }
@@ -137,10 +138,6 @@ func main() {
 		log.Fatalln(err)
 	}
 
-	NoColor = os.Getenv(EnvNoColor) != ""
-	NoSync = os.Getenv(EnvNoSync) == "1"
-	InodeTrust = os.Getenv(EnvInodeNoTrust) == ""
-
 	TopDir = os.Getenv(EnvTopDir)
 	if TopDir == "" {
 		TopDir = "/"
@@ -154,28 +151,28 @@ func main() {
 	DepCwd = os.Getenv(EnvDepCwd)
 
 	if flagStderrKeep != nil && *flagStderrKeep {
-		mustSetenv(EnvStderrKeep, "1")
+		mustSetenv(EnvStderrKeep)
 	}
 	if flagStderrSilent != nil && *flagStderrSilent {
-		mustSetenv(EnvStderrSilent, "1")
+		mustSetenv(EnvStderrSilent)
 	}
 	if flagNoProgress != nil && *flagNoProgress {
-		mustSetenv(EnvNoProgress, "1")
+		mustSetenv(EnvNoProgress)
 	}
 	if flagDebug != nil && *flagDebug {
-		mustSetenv(EnvDebug, "1")
+		mustSetenv(EnvDebug)
 	}
 	if flagLogWait != nil && *flagLogWait {
-		mustSetenv(EnvLogWait, "1")
+		mustSetenv(EnvLogWait)
 	}
 	if flagLogLock != nil && *flagLogLock {
-		mustSetenv(EnvLogLock, "1")
+		mustSetenv(EnvLogLock)
 	}
 	if flagLogPid != nil && *flagLogPid {
-		mustSetenv(EnvLogPid, "1")
+		mustSetenv(EnvLogPid)
 	}
 	if flagLogJS != nil && *flagLogJS {
-		mustSetenv(EnvLogJS, "1")
+		mustSetenv(EnvLogJS)
 	}
 	StderrKeep = os.Getenv(EnvStderrKeep) == "1"
 	StderrSilent = os.Getenv(EnvStderrSilent) == "1"
@@ -189,7 +186,7 @@ func main() {
 	}
 	var traced bool
 	if flagTraceAll != nil && *flagTraceAll {
-		mustSetenv(EnvTrace, "1")
+		mustSetenv(EnvTrace)
 	}
 	if os.Getenv(EnvTrace) == "1" {
 		TracedAll = true
@@ -197,6 +194,19 @@ func main() {
 	} else if flagTrace != nil {
 		traced = *flagTrace
 	}
+	NoColor = os.Getenv(EnvNoColor) != ""
+	NoSync = os.Getenv(EnvNoSync) == "1"
+	switch s := os.Getenv(EnvInodeTrust); s {
+	case "none":
+		InodeTrust = InodeTrustNone
+	case "", "ctime":
+		InodeTrust = InodeTrustCtime
+	case "mtime":
+		InodeTrust = InodeTrustMtime
+	default:
+		log.Fatalln("unknown", EnvInodeTrust, "value")
+	}
+	tracef(CDebug, "inode-trust: %s", InodeTrust)
 
 	// Those are internal envs
 	FdOODTgts, err = ioutil.TempFile("", "ood-tgts")
@@ -227,7 +237,9 @@ func main() {
 		if err != nil {
 			log.Fatalln(err)
 		}
-		unix.Flock(int(fdLock.Fd()), unix.LOCK_UN)
+		if err = unix.Flock(int(fdLock.Fd()), unix.LOCK_UN); err != nil {
+			log.Fatalln(err)
+		}
 		OODTgts = map[string]struct{}{}
 		for _, tgtRaw := range bytes.Split(tgtsRaw, []byte{0}) {
 			t := string(tgtRaw)
@@ -235,7 +247,7 @@ func main() {
 				continue
 			}
 			OODTgts[t] = struct{}{}
-			trace(CDebug, "ood: known to be: %s", t)
+			tracef(CDebug, "ood: known to be: %s", t)
 		}
 	}
 
@@ -284,23 +296,23 @@ func main() {
 		}
 	}
 
-	killed := make(chan os.Signal, 0)
+	killed := make(chan os.Signal, 1)
 	signal.Notify(killed, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
 		<-killed
-		trace(CDebug, "[%s] killed", BuildUUID)
+		tracef(CDebug, "[%s] killed", BuildUUID)
 		jsReleaseAll()
 		RunningProcsM.Lock()
 		for pid, proc := range RunningProcs {
-			trace(CDebug, "[%s] killing child %d", BuildUUID, pid)
-			proc.Signal(syscall.SIGTERM)
+			tracef(CDebug, "[%s] killing child %d", BuildUUID, pid)
+			_ = proc.Signal(syscall.SIGTERM)
 		}
 		os.Exit(1)
 	}()
 
 	ok := true
 	err = nil
-	trace(
+	tracef(
 		CDebug, "[%s] run: %s %s cwd:%s dirprefix:%s",
 		BuildUUID, cmdName, tgts, Cwd, DirPrefix,
 	)
@@ -317,7 +329,7 @@ CmdSwitch:
 	case CmdNameRedoIfchange:
 		ok, err = ifchange(tgts, false, traced)
 		if err == nil {
-			err = writeDeps(fdDep, tgts)
+			err = depsWrite(fdDep, tgts)
 		}
 	case CmdNameRedoIfcreate:
 		if fdDep == nil {
@@ -386,7 +398,7 @@ CmdSwitch:
 		for {
 			m, err := r.NextMap()
 			if err != nil {
-				if err == io.EOF {
+				if errors.Is(err, io.EOF) {
 					break
 				}
 				break CmdSwitch
@@ -487,6 +499,6 @@ CmdSwitch:
 	if !ok || err != nil {
 		rc = 1
 	}
-	trace(CDebug, "[%s] finished: %s %s", BuildUUID, cmdName, tgts)
+	tracef(CDebug, "[%s] finished: %s %s", BuildUUID, cmdName, tgts)
 	os.Exit(rc)
 }