X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=main.go;h=1262c57f53c2451a7459384d1f001b0528503ca1;hb=14398260feaf14dac68b9bdb1c810ccba7d1e768;hp=818b8dafeb830d85300c397107020572bfe0c32f;hpb=cc18c735b51ace648dedb7a425a0b2e41e724af6;p=goredo.git

diff --git a/main.go b/main.go
index 818b8da..1262c57 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>
+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
@@ -28,9 +28,9 @@ import (
 	"path"
 	"path/filepath"
 	"strconv"
+	"strings"
 
 	"go.cypherpunks.ru/recfile"
-	"golang.org/x/sys/unix"
 )
 
 var (
@@ -59,7 +59,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()
@@ -95,7 +95,7 @@ func main() {
 	log.SetFlags(0)
 
 	var err error
-	Cwd, err = unix.Getwd()
+	Cwd, err = os.Getwd()
 	if err != nil {
 		panic(err)
 	}
@@ -104,7 +104,9 @@ func main() {
 	NoSync = os.Getenv(EnvNoSync) == "1"
 
 	TopDir = os.Getenv(EnvTopDir)
-	if TopDir != "" {
+	if TopDir == "" {
+		TopDir = "/"
+	} else {
 		TopDir, err = filepath.Abs(TopDir)
 		if err != nil {
 			panic(err)
@@ -117,6 +119,9 @@ func main() {
 	if *flagStderrSilent {
 		mustSetenv(EnvStderrSilent, "1")
 	}
+	if *flagNoProgress {
+		mustSetenv(EnvNoProgress, "1")
+	}
 	if *flagDebug {
 		mustSetenv(EnvDebug, "1")
 	}
@@ -134,6 +139,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"
@@ -142,6 +148,9 @@ func main() {
 		MyPid = os.Getpid()
 	}
 	var traced bool
+	if *flagTraceAll {
+		mustSetenv(EnvTrace, "1")
+	}
 	if *flagTrace {
 		traced = true
 	} else {
@@ -164,6 +173,7 @@ 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 {
@@ -174,13 +184,18 @@ func main() {
 			"%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])
@@ -248,9 +263,9 @@ CmdSwitch:
 			break
 		}
 		os.Remove(fdTmp.Name())
-		var doFile string
 		cwd, tgt := cwdAndTgt(tgts[0])
-		doFile, _, err = findDo(fdTmp, cwd, tgt)
+		cwdRel := cwdMustRel(cwd)
+		doFile, upLevels, err := findDo(fdTmp, cwd, tgt)
 		if err != nil {
 			break
 		}
@@ -269,7 +284,11 @@ CmdSwitch:
 			}
 			fmt.Println(cwdMustRel(cwd, m["Target"]))
 		}
-		ok = doFile != ""
+		if doFile == "" {
+			ok = false
+		} else {
+			fmt.Println(path.Join(cwdRel, strings.Repeat("..", upLevels), doFile))
+		}
 	default:
 		log.Fatalln("unknown command", cmdName)
 	}