go fmt

[nncp.git] / src / ctx.go

diff --git a/src/ctx.go b/src/ctx.go
index 4d762d290cadfb83fde02a36e5bd74b8850a50d2..9f18563bbb8c65f7cd051861f079267ec5139910 100644 (file)
--- a/src/ctx.go
+++ b/src/ctx.go
@@ -21,13 +21,12 @@ import (
        "errors"
        "fmt"
        "io/ioutil"
-       "log"
        "os"
        "path/filepath"
+       "strconv"
+       "strings"
 
        "syscall"
-
-       "golang.org/x/sys/unix"
 )
 
 type Ctx struct {
@@ -75,14 +74,20 @@ func (ctx *Ctx) ensureRxDir(nodeId *NodeId) error {
        logMsg := func(les LEs) string {
                return fmt.Sprintf("Ensuring directory %s existence", dirPath)
        }
-       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
+               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
+               }
        }
        return fd.Close()
 }
@@ -138,6 +143,18 @@ func CtxFromCmdline(
        } else {
                ctx.LogPath = logPath
        }
+       if strings.HasPrefix(ctx.LogPath, LogFdPrefix) {
+               ptr, err := strconv.ParseUint(
+                       strings.TrimPrefix(ctx.LogPath, LogFdPrefix), 10, 64,
+               )
+               if err != nil {
+                       return nil, err
+               }
+               LogFd = os.NewFile(uintptr(ptr), CfgLogEnv)
+               if LogFd == nil {
+                       return nil, errors.New("can not open:" + ctx.LogPath)
+               }
+       }
        if showPrgrs {
                ctx.ShowPrgrs = true
        }
@@ -149,14 +166,6 @@ func CtxFromCmdline(
        return ctx, nil
 }
 
-func (ctx *Ctx) IsEnoughSpace(want int64) bool {
-       var s unix.Statfs_t
-       if err := unix.Statfs(ctx.Spool, &s); err != nil {
-               log.Fatalln("Can not stat spool:", err)
-       }
-       return int64(s.Bavail)*int64(s.Bsize) > want
-}
-
 func (ctx *Ctx) Umask() {
        if ctx.UmaskForce != nil {
                syscall.Umask(*ctx.UmaskForce)