X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=main.go;h=63f580a5319cb17e00c040df0b89d92615831912;hb=0b3f0c3c467fcfaaad3cb01ca00513b838fd75e6;hp=fdd0aac75a97dcec4f7aa5c458fa64a2b5fa8052;hpb=67e92d5a298516292bbbee1f7714708cdc0766f8;p=goredo.git

diff --git a/main.go b/main.go
index fdd0aac..63f580a 100644
--- a/main.go
+++ b/main.go
@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
+	"bufio"
 	"crypto/rand"
 	"flag"
 	"fmt"
@@ -84,11 +85,13 @@ func main() {
 			"redo-stamp",
 			"redo-whichdo",
 		} {
+			fmt.Println(os.Args[0], "<-", cmdName)
 			if err := os.Symlink(os.Args[0], cmdName); err != nil {
 				rc = 1
 				log.Println(err)
 			}
 		}
+		fmt.Println("no creating optional:", os.Args[0], "<- tai64nlocal")
 		os.Exit(rc)
 	}
 	log.SetFlags(0)
@@ -100,7 +103,6 @@ func main() {
 	}
 
 	NoColor = os.Getenv(EnvNoColor) != ""
-	NoHash = os.Getenv(EnvNoHash) == "1"
 	NoSync = os.Getenv(EnvNoSync) == "1"
 
 	TopDir = os.Getenv(EnvTopDir)
@@ -141,10 +143,11 @@ func main() {
 	if Debug || os.Getenv(EnvLogPid) == "1" {
 		MyPid = os.Getpid()
 	}
+	var traced bool
 	if *flagTrace {
-		Trace = true
+		traced = true
 	} else {
-		Trace = os.Getenv(EnvTrace) == "1"
+		traced = os.Getenv(EnvTrace) == "1"
 	}
 
 	// Those are internal envs
@@ -174,6 +177,7 @@ func main() {
 			raw[0:4], raw[4:6], raw[6:8], raw[8:10], raw[10:],
 		)
 	}
+	statusInit()
 
 	tgts := flag.Args()
 	if len(tgts) == 0 {
@@ -187,10 +191,14 @@ func main() {
 CmdSwitch:
 	switch cmdName {
 	case "redo":
-		Force = true
-		ok, err = ifchange(tgts)
+		for _, tgt := range tgts {
+			ok, err = ifchange([]string{tgt}, true, traced)
+			if err != nil || !ok {
+				break
+			}
+		}
 	case "redo-ifchange":
-		ok, err = ifchange(tgts)
+		ok, err = ifchange(tgts, false, traced)
 		writeDeps(fdDep, tgts)
 	case "redo-ifcreate":
 		if fdDep == nil {
@@ -248,7 +256,10 @@ CmdSwitch:
 		if err != nil {
 			break
 		}
-		fdTmp.Seek(0, 0)
+		_, err = fdTmp.Seek(0, 0)
+		if err != nil {
+			break
+		}
 		r := recfile.NewReader(fdTmp)
 		for {
 			m, err := r.NextMap()
@@ -261,6 +272,10 @@ CmdSwitch:
 			fmt.Println(cwdMustRel(cwd, m["Target"]))
 		}
 		ok = doFile != ""
+	case "tai64nlocal":
+		bw := bufio.NewWriter(os.Stdout)
+		err = tai64nLocal(bw, os.Stdin)
+		bw.Flush()
 	default:
 		log.Fatalln("unknown command", cmdName)
 	}