Raise copyright years

[nncp.git] / src / ctx.go

diff --git a/src/ctx.go b/src/ctx.go
index 9f18563bbb8c65f7cd051861f079267ec5139910..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
@@ -69,27 +69,30 @@ func (ctx *Ctx) FindNode(id string) (*Node, error) {
        return node, nil
 }
 
+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 !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(