X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=main.go;h=092d38957ce4cd50bbef6cacaa8db5d88c45c65b;hb=cb183690cc59ad772dab941adc3e9b8d5b90fbc0;hp=f7dcd3ca0d4fa2891efb5aff08781b05d5f0b599;hpb=609842c96d2bb25c509f3d2949fe26f60ec03a5f;p=goredo.git

diff --git a/main.go b/main.go
index f7dcd3c..092d389 100644
--- a/main.go
+++ b/main.go
@@ -160,10 +160,11 @@ func main() {
 	if *flagTraceAll {
 		mustSetenv(EnvTrace, "1")
 	}
-	if *flagTrace {
+	if os.Getenv(EnvTrace) == "1" {
+		TracedAll = true
 		traced = true
 	} else {
-		traced = os.Getenv(EnvTrace) == "1"
+		traced = *flagTrace
 	}
 
 	// Those are internal envs
@@ -188,7 +189,7 @@ func main() {
 		if err = unix.Flock(int(fdLock.Fd()), unix.LOCK_EX); err != nil {
 			panic(err)
 		}
-		if _, err = fd.Seek(0, os.SEEK_SET); err != nil {
+		if _, err = fd.Seek(0, io.SeekStart); err != nil {
 			panic(err)
 		}
 		tgtsRaw, err := ioutil.ReadAll(bufio.NewReader(fd))
@@ -225,6 +226,7 @@ func main() {
 
 	tgts := flag.Args()
 	BuildUUID = os.Getenv(EnvBuildUUID)
+	tgtsWasEmpty := len(tgts) == 0
 	if BuildUUID == "" {
 		raw := new([16]byte)
 		if _, err = io.ReadFull(rand.Reader, raw[:]); err != nil {
@@ -235,7 +237,7 @@ 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 {
+		if tgtsWasEmpty {
 			tgts = []string{"all"}
 		}
 	}
@@ -327,7 +329,7 @@ CmdSwitch:
 		if err != nil {
 			break
 		}
-		_, err = fdTmp.Seek(0, os.SEEK_SET)
+		_, err = fdTmp.Seek(0, io.SeekStart)
 		if err != nil {
 			break
 		}
@@ -358,13 +360,24 @@ CmdSwitch:
 			fmt.Println(rel)
 		}
 	case "redo-targets":
-		tgts, err = targetsWalker(Cwd)
+		if tgtsWasEmpty {
+			tgts = []string{Cwd}
+		}
+		tgts, err = targetsWalker(tgts)
+		if err != nil {
+			break
+		}
 		sort.Strings(tgts)
 		for _, tgt := range tgts {
 			fmt.Println(tgt)
 		}
 	case "redo-ood":
-		tgts, err = targetsWalker(Cwd)
+		if tgtsWasEmpty {
+			tgts, err = targetsWalker([]string{Cwd})
+			if err != nil {
+				break
+			}
+		}
 		sort.Strings(tgts)
 		var ood bool
 		for _, tgt := range tgts {
@@ -377,10 +390,18 @@ CmdSwitch:
 			}
 		}
 	case "redo-sources":
-		tgts, err = sourcesWalker()
+		if tgtsWasEmpty {
+			tgts, err = targetsWalker([]string{Cwd})
+			if err != nil {
+				break
+			}
+		}
 		sort.Strings(tgts)
-		for _, tgt := range tgts {
-			fmt.Println(tgt)
+		var srcs []string
+		srcs, err = sourcesWalker(tgts)
+		sort.Strings(srcs)
+		for _, src := range srcs {
+			fmt.Println(src)
 		}
 	default:
 		log.Fatalln("unknown command", cmdName)