infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-06-28 01:48:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Small tweak to LinkOrCopy, including defer for error handling

Browse Source
This commit is contained in:
Mechiel Lukkien 2025-03-01 10:25:47 +01:00
parent ffc7ed96bc
commit 7756150a69
No known key found for this signature in database
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
moxio/linkcopy.go
View File

@ -11,11 +11,13 @@ import (
// LinkOrCopy attempts to make a hardlink dst. If that fails, it will try to do a // LinkOrCopy attempts to make a hardlink dst. If that fails, it will try to do a
// regular file copy. If srcReaderOpt is not nil, it will be used for reading. If // regular file copy. If srcReaderOpt is not nil, it will be used for reading. If
// sync is true and the file is copied, Sync is called on the file after writing to // fileSync is true and the file is copied instead of hardlinked, fsync is called
// ensure the file is written on disk. Callers should also sync the directory of // on the file after writing to ensure the file is flushed to disk. Callers should
// the destination file, but may want to do that after linking/copying multiple // also sync the directory of the destination file, but may want to do that after
// files. If dst was created and an error occurred, it is removed. // linking/copying multiple files. If dst was created and an error occurred, it is
func LinkOrCopy(log mlog.Log, dst, src string, srcReaderOpt io.Reader, sync bool) (rerr error) { // removed.
func LinkOrCopy(log mlog.Log, dst, src string, srcReaderOpt io.Reader, fileSync bool) (rerr error) {
// Try hardlink first. // Try hardlink first.
err := os.Link(src, dst) err := os.Link(src, dst)
if err == nil { if err == nil {
@ -48,6 +50,8 @@ func LinkOrCopy(log mlog.Log, dst, src string, srcReaderOpt io.Reader, sync bool
if df != nil { if df != nil {
err := df.Close() err := df.Close()
log.Check(err, "closing partial destination file") log.Check(err, "closing partial destination file")
}
if rerr != nil {
err = os.Remove(dst) err = os.Remove(dst)
log.Check(err, "removing partial destination file", slog.String("path", dst)) log.Check(err, "removing partial destination file", slog.String("path", dst))
} }
@ -56,17 +60,14 @@ func LinkOrCopy(log mlog.Log, dst, src string, srcReaderOpt io.Reader, sync bool
if _, err := io.Copy(df, srcReaderOpt); err != nil { if _, err := io.Copy(df, srcReaderOpt); err != nil {
return fmt.Errorf("copy: %w", err) return fmt.Errorf("copy: %w", err)
} }
if sync { if fileSync {
if err := df.Sync(); err != nil { if err := df.Sync(); err != nil {
return fmt.Errorf("sync destination: %w", err) return fmt.Errorf("sync destination: %w", err)
} }
} }
err = df.Close() if err := df.Close(); err != nil {
df = nil return fmt.Errorf("flush and close destination file: %w", err)
if err != nil {
err := os.Remove(dst)
log.Check(err, "removing partial destination file", slog.String("path", dst))
return err
} }
df = nil
return nil return nil
} }