Explicitly remove possibly existed but now empty target result

[goredo.git] / main.go

diff --git a/main.go b/main.go
index 818b8dafeb830d85300c397107020572bfe0c32f..b5618e649916efac50dc6ca0d6668a330422f80a 100644 (file)
--- a/main.go
+++ b/main.go
@@ -28,6 +28,7 @@ import (
        "path"
        "path/filepath"
        "strconv"
+       "strings"
 
        "go.cypherpunks.ru/recfile"
        "golang.org/x/sys/unix"
@@ -104,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)
@@ -142,6 +145,9 @@ func main() {
                MyPid = os.Getpid()
        }
        var traced bool
+       if *flagTraceAll {
+               mustSetenv(EnvTrace, "1")
+       }
        if *flagTrace {
                traced = true
        } else {
@@ -248,9 +254,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
                }
@@ -269,7 +274,11 @@ CmdSwitch:
                        }
                        fmt.Println(cwdMustRel(cwd, m["Target"]))
                }
-               ok = doFile != ""
+               if doFile == "" {
+                       ok = false
+               } else {
+                       fmt.Println(path.Join(strings.Repeat("..", upLevels), doFile))
+               }
        default:
                log.Fatalln("unknown command", cmdName)
        }