X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Ftmp.go;h=aee58677518a562c55d7be7c56931061b2dbf83c;hb=0367cce2741e1ce6a89a49fd5c4e9df6005c9744;hp=88a7ec3847801a9d9fdbddcdf7ae3d67bc2098f4;hpb=1cc0df98a8d949b9f8137081b875d98a1aae2e67;p=nncp.git

diff --git a/src/tmp.go b/src/tmp.go
index 88a7ec3..aee5867 100644
--- a/src/tmp.go
+++ b/src/tmp.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
@@ -37,8 +37,7 @@ func TempFile(dir, prefix string) (*os.File, error) {
 
 func (ctx *Ctx) NewTmpFile() (*os.File, error) {
 	jobsPath := filepath.Join(ctx.Spool, "tmp")
-	var err error
-	if err = os.MkdirAll(jobsPath, os.FileMode(0777)); err != nil {
+	if err := ensureDir(jobsPath); err != nil {
 		return nil, err
 	}
 	fd, err := TempFile(jobsPath, "")
@@ -72,9 +71,9 @@ func (ctx *Ctx) NewTmpFileWHash() (*TmpFileWHash, error) {
 }
 
 func (tmp *TmpFileWHash) Cancel() {
-	tmp.Fd.Truncate(0)       // #nosec G104
-	tmp.Fd.Close()           // #nosec G104
-	os.Remove(tmp.Fd.Name()) // #nosec G104
+	tmp.Fd.Truncate(0)
+	tmp.Fd.Close()
+	os.Remove(tmp.Fd.Name())
 }
 
 func DirSync(dirPath string) error {
@@ -84,7 +83,7 @@ func DirSync(dirPath string) error {
 	}
 	err = fd.Sync()
 	if err != nil {
-		fd.Close() // #nosec G104
+		fd.Close()
 		return err
 	}
 	return fd.Close()
@@ -96,15 +95,15 @@ func (tmp *TmpFileWHash) Checksum() string {
 
 func (tmp *TmpFileWHash) Commit(dir string) error {
 	var err error
-	if err = os.MkdirAll(dir, os.FileMode(0777)); err != nil {
+	if err = ensureDir(dir); err != nil {
 		return err
 	}
 	if err = tmp.W.Flush(); err != nil {
-		tmp.Fd.Close() // #nosec G104
+		tmp.Fd.Close()
 		return err
 	}
 	if err = tmp.Fd.Sync(); err != nil {
-		tmp.Fd.Close() // #nosec G104
+		tmp.Fd.Close()
 		return err
 	}
 	if err = tmp.Fd.Close(); err != nil {