Raise copyright years

[nncp.git] / src / ctx.go

diff --git a/src/ctx.go b/src/ctx.go
index 63d1fc27353dac5682fee2ce24b0d0adde87fdf9..655c3e9bce07052a6469e5dfa82e1fc4a42134be 100644 (file)
--- a/src/ctx.go
+++ b/src/ctx.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,13 +21,12 @@ import (
        "errors"
        "fmt"
        "io/ioutil"
-       "log"
        "os"
        "path/filepath"
+       "strconv"
+       "strings"
 
        "syscall"
-
-       "golang.org/x/sys/unix"
 )
 
 type Ctx struct {
@@ -70,27 +69,34 @@ func (ctx *Ctx) FindNode(id string) (*Node, error) {
        return node, nil
 }
 
-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)
+func ensureDir(dirs ...string) error {
+       p := filepath.Join(dirs...)
+       fi, err := os.Stat(p)
+       if err == nil {
+               if fi.IsDir() {
+                       return nil
+               }
+               return fmt.Errorf("%s: is not a directory", p)
        }
-       if err := os.MkdirAll(dirPath, os.FileMode(0777)); err != nil {
-               ctx.LogE("dir-ensure-mkdir", LEs{{"Dir", dirPath}}, err, logMsg)
+       if !os.IsNotExist(err) {
                return err
        }
-       fd, err := os.Open(dirPath)
+       return os.MkdirAll(p, os.FileMode(0777))
+}
+
+func (ctx *Ctx) ensureRxDir(nodeId *NodeId) error {
+       dirPath := filepath.Join(ctx.Spool, nodeId.String(), string(TRx))
+       err := ensureDir(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(
-       cfgPath,
-       spoolPath,
-       logPath string,
+       cfgPath, spoolPath, logPath string,
        quiet, showPrgrs, omitPrgrs, debug bool,
 ) (*Ctx, error) {
        env := os.Getenv(CfgPathEnv)
@@ -100,11 +106,27 @@ func CtxFromCmdline(
        if showPrgrs && omitPrgrs {
                return nil, errors.New("simultaneous -progress and -noprogress")
        }
-       cfgRaw, err := ioutil.ReadFile(cfgPath)
+       fi, err := os.Stat(cfgPath)
        if err != nil {
                return nil, err
        }
-       ctx, err := CfgParse(cfgRaw)
+       var cfg *CfgJSON
+       if fi.IsDir() {
+               cfg, err = DirToCfg(cfgPath)
+               if err != nil {
+                       return nil, err
+               }
+       } else {
+               cfgRaw, err := ioutil.ReadFile(cfgPath)
+               if err != nil {
+                       return nil, err
+               }
+               cfg, err = CfgParse(cfgRaw)
+               if err != nil {
+                       return nil, err
+               }
+       }
+       ctx, err := Cfg2Ctx(cfg)
        if err != nil {
                return nil, err
        }
@@ -124,6 +146,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
        }
@@ -135,14 +169,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(err)
-       }
-       return int64(s.Bavail)*int64(s.Bsize) > want
-}
-
 func (ctx *Ctx) Umask() {
        if ctx.UmaskForce != nil {
                syscall.Umask(*ctx.UmaskForce)