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

diff --git a/main.go b/main.go
index 63f580a..2007215 100644
--- a/main.go
+++ b/main.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
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-	"bufio"
 	"crypto/rand"
 	"flag"
 	"fmt"
@@ -31,7 +30,6 @@ import (
 	"strconv"
 
 	"go.cypherpunks.ru/recfile"
-	"golang.org/x/sys/unix"
 )
 
 var (
@@ -60,7 +58,7 @@ func mustParseFd(v, name string) *os.File {
 func main() {
 	version := flag.Bool("version", false, "print version")
 	warranty := flag.Bool("warranty", false, "print warranty information")
-	symlinks := flag.Bool("symlinks", false, "create necessary symlinks in current direcotyr")
+	symlinks := flag.Bool("symlinks", false, "create necessary symlinks in current directory")
 
 	flag.Usage = usage
 	flag.Parse()
@@ -91,27 +89,30 @@ func main() {
 				log.Println(err)
 			}
 		}
-		fmt.Println("no creating optional:", os.Args[0], "<- tai64nlocal")
 		os.Exit(rc)
 	}
 	log.SetFlags(0)
 
 	var err error
-	Cwd, err = unix.Getwd()
+	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 != "" {
+	if TopDir == "" {
+		TopDir = "/"
+	} else {
 		TopDir, err = filepath.Abs(TopDir)
 		if err != nil {
 			panic(err)
 		}
 	}
+	DirPrefix = os.Getenv(EnvDirPrefix)
 
 	if *flagStderrKeep {
 		mustSetenv(EnvStderrKeep, "1")
@@ -119,6 +120,9 @@ func main() {
 	if *flagStderrSilent {
 		mustSetenv(EnvStderrSilent, "1")
 	}
+	if *flagNoProgress {
+		mustSetenv(EnvNoProgress, "1")
+	}
 	if *flagDebug {
 		mustSetenv(EnvDebug, "1")
 	}
@@ -136,6 +140,7 @@ func main() {
 	}
 	StderrKeep = os.Getenv(EnvStderrKeep) == "1"
 	StderrSilent = os.Getenv(EnvStderrSilent) == "1"
+	NoProgress = os.Getenv(EnvNoProgress) == "1"
 	Debug = os.Getenv(EnvDebug) == "1"
 	LogWait = os.Getenv(EnvLogWait) == "1"
 	LogLock = os.Getenv(EnvLogLock) == "1"
@@ -144,6 +149,9 @@ func main() {
 		MyPid = os.Getpid()
 	}
 	var traced bool
+	if *flagTraceAll {
+		mustSetenv(EnvTrace, "1")
+	}
 	if *flagTrace {
 		traced = true
 	} else {
@@ -166,27 +174,36 @@ func main() {
 		fdDep = mustParseFd(v, EnvDepFd)
 	}
 	BuildUUID = os.Getenv(EnvBuildUUID)
+	tgts := flag.Args()
 	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(
 			"%x-%x-%x-%x-%x",
 			raw[0:4], raw[4:6], raw[6:8], raw[8:10], raw[10:],
 		)
+		if len(tgts) == 0 {
+			tgts = []string{"all"}
+		}
 	}
 	statusInit()
 
-	tgts := flag.Args()
-	if len(tgts) == 0 {
-		tgts = []string{"all"}
+	for i, tgt := range tgts {
+		if path.IsAbs(tgt) {
+			tgts[i] = cwdMustRel(tgt)
+		}
 	}
+
 	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 {
@@ -199,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)
@@ -250,9 +269,8 @@ CmdSwitch:
 			break
 		}
 		os.Remove(fdTmp.Name())
-		var doFile string
 		cwd, tgt := cwdAndTgt(tgts[0])
-		doFile, _, err = findDo(fdTmp, cwd, tgt)
+		doFile, upLevels, err := findDo(fdTmp, cwd, tgt)
 		if err != nil {
 			break
 		}
@@ -271,11 +289,21 @@ CmdSwitch:
 			}
 			fmt.Println(cwdMustRel(cwd, m["Target"]))
 		}
-		ok = doFile != ""
-	case "tai64nlocal":
-		bw := bufio.NewWriter(os.Stdout)
-		err = tai64nLocal(bw, os.Stdin)
-		bw.Flush()
+		if doFile == "" {
+			ok = false
+		} else {
+			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)
 	}