X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Ftmp.go;h=4a43eaa41a2675969f0d7109fe362f5304c93866;hb=6a7abf90c3ac2ccf5b9e29818d8507bad4326b33;hp=a1ef2e86f53f2981a8979920050950c35760946e;hpb=38c1f9a8c6b8d41ea2d4c86d6f18adea407fdc35;p=nncp.git diff --git a/src/tmp.go b/src/tmp.go index a1ef2e8..4a43eaa 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 +Copyright (C) 2016-2022 Sergey Matveev 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 @@ -28,6 +28,12 @@ import ( "time" ) +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) @@ -37,7 +43,7 @@ func TempFile(dir, prefix string) (*os.File, error) { func (ctx *Ctx) NewTmpFile() (*os.File, error) { jobsPath := filepath.Join(ctx.Spool, "tmp") - if err := os.MkdirAll(jobsPath, os.FileMode(0777)); err != nil { + if err := ensureDir(jobsPath); err != nil { return nil, err } fd, err := TempFile(jobsPath, "") @@ -71,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() @@ -95,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