X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fctx.go;h=b1b590b351fa9169805222cdabda34a2276b3a2d;hb=e181d969028a017c6ac513ea49e8abc2fc2d8cf1;hp=9f18563bbb8c65f7cd051861f079267ec5139910;hpb=d8fd3b7cbda88b6a68728edbdec841d673bfde3a;p=nncp.git

diff --git a/src/ctx.go b/src/ctx.go
index 9f18563..b1b590b 100644
--- a/src/ctx.go
+++ b/src/ctx.go
@@ -69,27 +69,29 @@ func (ctx *Ctx) FindNode(id string) (*Node, error) {
 	return node, nil
 }
 
+func ensureDir(p string) error {
+	fi, err := os.Stat(p)
+	if err == nil {
+		if fi.IsDir() {
+			return nil
+		}
+		return fmt.Errorf("%s: is not a directory", p)
+	}
+	if !os.IsNotExist(err) {
+		return err
+	}
+	return os.MkdirAll(p, os.FileMode(0777))
+}
+
 func (ctx *Ctx) ensureRxDir(nodeId *NodeId) error {
 	dirPath := filepath.Join(ctx.Spool, nodeId.String(), string(TRx))
-	logMsg := func(les LEs) string {
-		return fmt.Sprintf("Ensuring directory %s existence", dirPath)
-	}
-	fd, err := os.Open(dirPath)
+	err := ensureDir(dirPath)
 	if err != nil {
-		if !os.IsNotExist(err) {
-			return err
-		}
-		if err := os.MkdirAll(dirPath, os.FileMode(0777)); err != nil {
-			ctx.LogE("dir-ensure-mkdir", LEs{{"Dir", dirPath}}, err, logMsg)
-			return err
-		}
-		fd, err = os.Open(dirPath)
-		if err != nil {
-			ctx.LogE("dir-ensure-open", LEs{{"Dir", dirPath}}, err, logMsg)
-			return err
-		}
+		ctx.LogE("dir-ensure-mkdir", LEs{{"Dir", dirPath}}, err, func(les LEs) string {
+			return fmt.Sprintf("Ensuring directory %s existence", dirPath)
+		})
 	}
-	return fd.Close()
+	return err
 }
 
 func CtxFromCmdline(