Fix targets with absolute paths workability

[goredo.git] / main.go

diff --git a/main.go b/main.go
index 63f580a5319cb17e00c040df0b89d92615831912..ed87a54efa8b84e3706e1436b5f5e59e2c613d62 100644 (file)
--- a/main.go
+++ b/main.go
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-       "bufio"
        "crypto/rand"
        "flag"
        "fmt"
@@ -29,6 +28,7 @@ import (
        "path"
        "path/filepath"
        "strconv"
+       "strings"
 
        "go.cypherpunks.ru/recfile"
        "golang.org/x/sys/unix"
@@ -91,7 +91,6 @@ func main() {
                                log.Println(err)
                        }
                }
-               fmt.Println("no creating optional:", os.Args[0], "<- tai64nlocal")
                os.Exit(rc)
        }
        log.SetFlags(0)
@@ -106,7 +105,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)
@@ -144,6 +145,9 @@ func main() {
                MyPid = os.Getpid()
        }
        var traced bool
+       if *flagTraceAll {
+               mustSetenv(EnvTrace, "1")
+       }
        if *flagTrace {
                traced = true
        } else {
@@ -166,6 +170,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 {
@@ -176,13 +181,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])
@@ -250,9 +260,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 +280,11 @@ 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 {
+                       fmt.Println(path.Join(strings.Repeat("..", upLevels), doFile))
+               }
        default:
                log.Fatalln("unknown command", cmdName)
        }