X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=do.go;h=4f9259cb18acbe898400a7a664fed24b49ba4dac;hb=6dce71355599d4caf8267f6f02520037480f7ba3;hp=202e964ea486d991d26e088b83eacabe333ef622;hpb=e1afa1a3b0f7e4e06f636f584a47bb8cfc885e7c;p=goredo.git

diff --git a/do.go b/do.go
index 202e964..4f9259c 100644
--- a/do.go
+++ b/do.go
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-	"os"
+	"io"
 	"path"
 	"strings"
 )
@@ -32,16 +32,16 @@ const (
 
 var TopDir string
 
-func existsDo(fdDep *os.File, cwd, pth string) (bool, error) {
+func existsDo(w io.Writer, fdDepName, cwd, pth string) (bool, error) {
 	if FileExists(path.Join(cwd, pth)) {
 		return true, nil
 	}
-	return false, ifcreate(fdDep, pth)
+	return false, ifcreate(w, fdDepName, pth)
 }
 
-func findDo(fdDep *os.File, cwd, tgt string) (string, int, error) {
+func findDo(w io.Writer, fdDepName, cwd, tgt string) (string, int, error) {
 	doFile := tgt + ".do"
-	exists, err := existsDo(fdDep, cwd, doFile)
+	exists, err := existsDo(w, fdDepName, cwd, doFile)
 	if err != nil {
 		return "", 0, err
 	}
@@ -60,7 +60,7 @@ func findDo(fdDep *os.File, cwd, tgt string) (string, int, error) {
 				[]string{"default"}, append(exts, "do")...,
 			), ".")
 			if len(levels) > 0 || (doFile != doFileOrig && doFile != tgt) {
-				exists, err = existsDo(fdDep, cwd, path.Join(updir, doFile))
+				exists, err = existsDo(w, fdDepName, cwd, path.Join(updir, doFile))
 				if err != nil {
 					return "", 0, err
 				}
@@ -72,7 +72,7 @@ func findDo(fdDep *os.File, cwd, tgt string) (string, int, error) {
 		}
 		doFile = "default.do"
 		if len(levels) > 0 || (doFile != doFileOrig && doFile != tgt) {
-			exists, err = existsDo(fdDep, cwd, path.Join(updir, doFile))
+			exists, err = existsDo(w, fdDepName, cwd, path.Join(updir, doFile))
 			if err != nil {
 				return "", 0, err
 			}