X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=main.go;h=f6304aca8dd3b92c4d2a05bb77cc714ebd96842b;hb=fc065e1408aa2e452699d1bae1a56af9fcc69bec;hp=b54baadb1fe7e376d7e68eed57112d461e83e969;hpb=d9d136ebf49a2906cd0b1def833ade96784626f6;p=goredo.git

diff --git a/main.go b/main.go
index b54baad..f6304ac 100644
--- a/main.go
+++ b/main.go
@@ -353,6 +353,7 @@ CmdSwitch:
 				path.Join(Cwd, tgt),
 			)
 			if err != nil {
+				err = ErrLine(err)
 				break
 			}
 			err = ifcreate(fdDep, tgtRel)
@@ -392,18 +393,22 @@ CmdSwitch:
 		var fdTmp *os.File
 		fdTmp, err = os.CreateTemp("", "whichdo")
 		if err != nil {
+			err = ErrLine(err)
 			break
 		}
 		if err = os.Remove(fdTmp.Name()); err != nil {
+			err = ErrLine(err)
 			break
 		}
 		cwd, tgt := cwdAndTgt(tgts[0])
 		doFile, upLevels, err := findDo(fdTmp, cwd, tgt)
 		if err != nil {
+			err = ErrLine(err)
 			break
 		}
 		_, err = fdTmp.Seek(0, io.SeekStart)
 		if err != nil {
+			err = ErrLine(err)
 			break
 		}
 		r := recfile.NewReader(fdTmp)
@@ -413,6 +418,7 @@ CmdSwitch:
 				if errors.Is(err, io.EOF) {
 					break
 				}
+				err = ErrLine(err)
 				break CmdSwitch
 			}
 			fmt.Println(cwdMustRel(cwd, m["Target"]))
@@ -438,6 +444,7 @@ CmdSwitch:
 		}
 		tgts, err = targetsWalker(tgts)
 		if err != nil {
+			err = ErrLine(err)
 			break
 		}
 		sort.Strings(tgts)
@@ -451,6 +458,7 @@ CmdSwitch:
 		var tgtsKnown []string
 		tgtsKnown, err = targetsWalker([]string{Cwd})
 		if err != nil {
+			err = ErrLine(err)
 			break
 		}
 		deps := map[string]map[string]struct{}{}
@@ -481,6 +489,7 @@ CmdSwitch:
 		for _, tgt := range tgts {
 			ood, err = isOOD(Cwd, tgt, 0, nil)
 			if err != nil {
+				err = ErrLine(err)
 				break
 			}
 			if ood {
@@ -491,12 +500,14 @@ CmdSwitch:
 		if tgtsWasEmpty {
 			tgts, err = targetsWalker([]string{Cwd})
 			if err != nil {
+				err = ErrLine(err)
 				break
 			}
 		}
 		sort.Strings(tgts)
 		var srcs []string
 		srcs, err = sourcesWalker(tgts)
+		err = ErrLine(err)
 		sort.Strings(srcs)
 		for _, src := range srcs {
 			fmt.Println(src)
@@ -508,12 +519,14 @@ CmdSwitch:
 		for _, tgt := range tgts {
 			inode, err = inodeFromFileByPath(tgt)
 			if err != nil {
+				err = ErrLine(err)
 				break
 			}
 			err = recfileWrite(os.Stdout, append(
 				[]recfile.Field{{Name: "Target", Value: tgt}},
 				inode.RecfileFields()...)...)
 			if err != nil {
+				err = ErrLine(err)
 				break
 			}
 		}