ensureDir helper

diff --git a/src/ctx.go b/src/ctx.go
index 9f18563bbb8c65f7cd051861f079267ec5139910..b1b590b351fa9169805222cdabda34a2276b3a2d 100644 (file)
--- 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(

diff --git a/src/dirwatch.go b/src/dirwatch.go
index 69a200b364ef122e0902c585f1768f650d079554..85aaa513ee33969550556f2d5e7e3ffc87420b9e 100644 (file)
--- a/src/dirwatch.go
+++ b/src/dirwatch.go
@@ -22,7 +22,6 @@ package nncp
 
 import (
        "fmt"
-       "os"
        "time"
 
        "github.com/fsnotify/fsnotify"
@@ -39,21 +38,14 @@ func (ctx *Ctx) NewDirWatcher(dir string, d time.Duration) (*DirWatcher, error)
        if err != nil {
                return nil, err
        }
+       err = ensureDir(dir)
+       if err != nil {
+               return nil, err
+       }
        err = w.Add(dir)
        if err != nil {
-               if !os.IsNotExist(err) {
-                       w.Close()
-                       return nil, err
-               }
-               if err = os.MkdirAll(dir, os.FileMode(0777)); err != nil {
-                       w.Close()
-                       return nil, err
-               }
-               err = w.Add(dir)
-               if err != nil {
-                       w.Close()
-                       return nil, err
-               }
+               w.Close()
+               return nil, err
        }
        dw := DirWatcher{
                w:      w,

diff --git a/src/tmp.go b/src/tmp.go
index 6d1e49c08e132794b5faa1934342bbb7b5d32823..163acb366d50873c3a484548604f0050eba92d3a 100644 (file)
--- a/src/tmp.go
+++ b/src/tmp.go
@@ -37,13 +37,8 @@ func TempFile(dir, prefix string) (*os.File, error) {
 
 func (ctx *Ctx) NewTmpFile() (*os.File, error) {
        jobsPath := filepath.Join(ctx.Spool, "tmp")
-       if _, err := os.Stat(jobsPath); err != nil {
-               if !os.IsNotExist(err) {
-                       return nil, err
-               }
-               if err := os.MkdirAll(jobsPath, os.FileMode(0777)); err != nil {
-                       return nil, err
-               }
+       if err := ensureDir(jobsPath); err != nil {
+               return nil, err
        }
        fd, err := TempFile(jobsPath, "")
        if err == nil {
@@ -100,13 +95,8 @@ func (tmp *TmpFileWHash) Checksum() string {
 
 func (tmp *TmpFileWHash) Commit(dir string) error {
        var err error
-       if _, err = os.Stat(dir); err != nil {
-               if !os.IsNotExist(err) {
-                       return err
-               }
-               if err = os.MkdirAll(dir, os.FileMode(0777)); err != nil {
-                       return err
-               }
+       if err = ensureDir(dir); err != nil {
+               return err
        }
        if err = tmp.W.Flush(); err != nil {
                tmp.Fd.Close()

diff --git a/src/tx.go b/src/tx.go
index 95801d50b542000759b1a6ee787a388fd3ddc575..2b166d1d49b546999acf8085de99cf28fdf3f3ce 100644 (file)
--- a/src/tx.go
+++ b/src/tx.go
@@ -257,15 +257,9 @@ func (ctx *Ctx) Tx(
                                msgHash,
                        )
                }
-               if _, err = os.Stat(seenDir); err != nil {
-                       if !os.IsNotExist(err) {
-                               ctx.LogE("tx-mkdir", les, err, logMsg)
-                               return lastNode, err
-                       }
-                       if err = os.MkdirAll(seenDir, os.FileMode(0777)); err != nil {
-                               ctx.LogE("tx-mkdir", les, err, logMsg)
-                               return lastNode, err
-                       }
+               if err = ensureDir(seenDir); err != nil {
+                       ctx.LogE("tx-mkdir", les, err, logMsg)
+                       return lastNode, err
                }
                if fd, err := os.Create(seenPath); err == nil {
                        fd.Close()