atomicWriteFile: file defer close

helen · helen · commit 9eb2a492babf · 2023-02-23T10:32:50.000+08:00
Signed-off-by: helen &lt;haitao.zhang@daocloud.io&gt;
diff --git a/ioutils.go b/ioutils.go
@@ -37,26 +37,32 @@ func atomicWriteFile(filename string, r io.Reader, dataSize int64, perm os.FileM
 	if err != nil {
 		return err
 	}
+	needClose := true
+	defer func() {
+		if needClose {
+			f.Close()
+		}
+	}()
+
 	err = os.Chmod(f.Name(), perm)
 	if err != nil {
-		f.Close()
 		return err
 	}
 	n, err := io.Copy(f, r)
 	if err == nil && n < dataSize {
-		f.Close()
 		return io.ErrShortWrite
 	}
 	if err != nil {
-		f.Close()
 		return err
 	}
-	if err := f.Sync(); err != nil {
-		f.Close()
+	if err = f.Sync(); err != nil {
 		return err
 	}
+
+	needClose = false
 	if err := f.Close(); err != nil {
 		return err
 	}
+
 	return os.Rename(f.Name(), filename)
 }

Original file line number	Diff line number	Diff line change
`@@ -37,26 +37,32 @@ func atomicWriteFile(filename string, r io.Reader, dataSize int64, perm os.FileM`
`37`	`37`	`if err != nil {`
`38`	`38`	`return err`
`39`	`39`	`}`
	`40`	`+ needClose := true`
	`41`	`+ defer func() {`
	`42`	`+ if needClose {`
	`43`	`+ f.Close()`
	`44`	`+ }`
	`45`	`+ }()`
	`46`	`+`
`40`	`47`	`err = os.Chmod(f.Name(), perm)`
`41`	`48`	`if err != nil {`
`42`		`- f.Close()`
`43`	`49`	`return err`
`44`	`50`	`}`
`45`	`51`	`n, err := io.Copy(f, r)`
`46`	`52`	`if err == nil && n < dataSize {`
`47`		`- f.Close()`
`48`	`53`	`return io.ErrShortWrite`
`49`	`54`	`}`
`50`	`55`	`if err != nil {`
`51`		`- f.Close()`
`52`	`56`	`return err`
`53`	`57`	`}`
`54`		`- if err := f.Sync(); err != nil {`
`55`		`- f.Close()`
	`58`	`+ if err = f.Sync(); err != nil {`
`56`	`59`	`return err`
`57`	`60`	`}`
	`61`	`+`
	`62`	`+ needClose = false`
`58`	`63`	`if err := f.Close(); err != nil {`
`59`	`64`	`return err`
`60`	`65`	`}`
	`66`	`+`
`61`	`67`	`return os.Rename(f.Name(), filename)`
`62`	`68`	`}`