X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=main.go;h=20072155f67c423ac294d82014af923f90f5280d;hb=fa0728d6bc790672982ba006961077371d2b552d;hp=1262c57f53c2451a7459384d1f001b0528503ca1;hpb=edb601644735972fac3efcdc27849b5b9b1f5fb7;p=goredo.git

diff --git a/main.go b/main.go
index 1262c57..2007215 100644
--- a/main.go
+++ b/main.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
@@ -28,7 +28,6 @@ import (
 	"path"
 	"path/filepath"
 	"strconv"
-	"strings"
 
 	"go.cypherpunks.ru/recfile"
 )
@@ -97,11 +96,12 @@ func main() {
 	var err error
 	Cwd, err = os.Getwd()
 	if err != nil {
-		panic(err)
+		log.Fatalln(err)
 	}
 
 	NoColor = os.Getenv(EnvNoColor) != ""
 	NoSync = os.Getenv(EnvNoSync) == "1"
+	InodeTrust = os.Getenv(EnvInodeNoTrust) == ""
 
 	TopDir = os.Getenv(EnvTopDir)
 	if TopDir == "" {
@@ -112,6 +112,7 @@ func main() {
 			panic(err)
 		}
 	}
+	DirPrefix = os.Getenv(EnvDirPrefix)
 
 	if *flagStderrKeep {
 		mustSetenv(EnvStderrKeep, "1")
@@ -177,7 +178,7 @@ func main() {
 	if BuildUUID == "" {
 		raw := new([16]byte)
 		if _, err = io.ReadFull(rand.Reader, raw[:]); err != nil {
-			panic(err)
+			log.Fatalln(err)
 		}
 		raw[6] = (raw[6] & 0x0F) | uint8(4<<4) // version 4
 		BuildUUID = fmt.Sprintf(
@@ -199,7 +200,10 @@ func main() {
 	ok := true
 	err = nil
 	cmdName := path.Base(os.Args[0])
-	trace(CDebug, "[%s] run: %s %s [%s]", BuildUUID, cmdName, tgts, Cwd)
+	trace(
+		CDebug, "[%s] run: %s %s cwd:%s dirprefix:%s",
+		BuildUUID, cmdName, tgts, Cwd, DirPrefix,
+	)
 
 CmdSwitch:
 	switch cmdName {
@@ -212,7 +216,9 @@ CmdSwitch:
 		}
 	case "redo-ifchange":
 		ok, err = ifchange(tgts, false, traced)
-		writeDeps(fdDep, tgts)
+		if err == nil {
+			err = writeDeps(fdDep, tgts)
+		}
 	case "redo-ifcreate":
 		if fdDep == nil {
 			log.Fatalln("no", EnvDepFd)
@@ -264,7 +270,6 @@ CmdSwitch:
 		}
 		os.Remove(fdTmp.Name())
 		cwd, tgt := cwdAndTgt(tgts[0])
-		cwdRel := cwdMustRel(cwd)
 		doFile, upLevels, err := findDo(fdTmp, cwd, tgt)
 		if err != nil {
 			break
@@ -287,7 +292,17 @@ CmdSwitch:
 		if doFile == "" {
 			ok = false
 		} else {
-			fmt.Println(path.Join(cwdRel, strings.Repeat("..", upLevels), doFile))
+			p := make([]string, 0, upLevels+2)
+			p = append(p, cwd)
+			for i := 0; i < upLevels; i++ {
+				p = append(p, "..")
+			}
+			p = append(p, doFile)
+			rel, err := filepath.Rel(Cwd, path.Join(p...))
+			if err != nil {
+				panic(err)
+			}
+			fmt.Println(rel)
 		}
 	default:
 		log.Fatalln("unknown command", cmdName)