X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Ftmp.go;h=c4f57c167dad4ba6353f1c08c2edbde8ddaeff32;hb=cf9363f956cb2d93a581c11ed65c5b02910d10d5;hp=da96a25bfd0785f9bdc7b8aa48e523b01c47360f;hpb=f74ee2d73c6f1c1dd8e5c7caf8a8118d80a2be89;p=nncp.git

diff --git a/src/tmp.go b/src/tmp.go
index da96a25..c4f57c1 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-2023 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
@@ -26,10 +26,14 @@ import (
 	"path/filepath"
 	"strconv"
 	"time"
-
-	"golang.org/x/crypto/blake2b"
 )
 
+var NoSync bool
+
+func init() {
+	NoSync = os.Getenv(CfgNoSync) != ""
+}
+
 func TempFile(dir, prefix string) (*os.File, error) {
 	// Assume that probability of suffix collision is negligible
 	suffix := strconv.FormatInt(time.Now().UnixNano()+int64(os.Getpid()), 16)
@@ -39,8 +43,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, "")
@@ -64,10 +67,7 @@ func (ctx *Ctx) NewTmpFileWHash() (*TmpFileWHash, error) {
 	if err != nil {
 		return nil, err
 	}
-	hsh, err := blake2b.New256(nil)
-	if err != nil {
-		return nil, err
-	}
+	hsh := MTHNew(0, 0)
 	return &TmpFileWHash{
 		W:   bufio.NewWriter(io.MultiWriter(hsh, tmp)),
 		Fd:  tmp,
@@ -77,19 +77,22 @@ 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 {
+	if NoSync {
+		return nil
+	}
 	fd, err := os.Open(dirPath)
 	if err != nil {
 		return err
 	}
 	err = fd.Sync()
 	if err != nil {
-		fd.Close() // #nosec G104
+		fd.Close()
 		return err
 	}
 	return fd.Close()
@@ -101,16 +104,18 @@ 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
-		return err
+	if !NoSync {
+		if err = tmp.Fd.Sync(); err != nil {
+			tmp.Fd.Close()
+			return err
+		}
 	}
 	if err = tmp.Fd.Close(); err != nil {
 		return err