Skip to content

Small code path cleanup #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sdassow wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Small code path cleanup #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions atomic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,25 @@ func WriteFile(filename string, r io.Reader) (err error) {
if err := f.Sync(); err != nil {
return fmt.Errorf("can't flush tempfile %q: %v", name, err)
}
// get file info via file descriptor before closing it.
sourceInfo, err := f.Stat()
if err != nil {
return err
}
if err := f.Close(); err != nil {
return fmt.Errorf("can't close tempfile %q: %v", name, err)
}

// get the file mode from the original file and use that for the replacement
// file, too.
destInfo, err := os.Stat(filename)
if os.IsNotExist(err) {
// no original file
} else if err != nil {
if err != nil && !os.IsNotExist(err) {
return err
} else {
sourceInfo, err := os.Stat(name)
if err != nil {
return err
}

if sourceInfo.Mode() != destInfo.Mode() {
if err := os.Chmod(name, destInfo.Mode()); err != nil {
return fmt.Errorf("can't set filemode on tempfile %q: %v", name, err)
}
}
// check for nil as one error type is allowed to happen.
if destInfo != nil && destInfo.Mode() != sourceInfo.Mode() {
if err := os.Chmod(name, destInfo.Mode()); err != nil {
return fmt.Errorf("can't set filemode on tempfile %q: %v", name, err)
}
}
if err := ReplaceFile(name, filename); err != nil {
Expand Down