mirror of
https://github.com/kovidgoyal/kitty
synced 2026-07-24 09:18:08 +02:00
cleanup close file error handling
This commit is contained in:
@@ -1059,6 +1059,12 @@ func receive_loop(opts *Options, spec []string, dest string) (err error, rc int)
|
|||||||
}
|
}
|
||||||
|
|
||||||
err = lp.Run()
|
err = lp.Run()
|
||||||
|
defer func() {
|
||||||
|
for _, f := range handler.manager.files {
|
||||||
|
f.close()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err, 1
|
return err, 1
|
||||||
}
|
}
|
||||||
@@ -1072,8 +1078,10 @@ func receive_loop(opts *Options, spec []string, dest string) (err error, rc int)
|
|||||||
}
|
}
|
||||||
var tsf, dsz, ssz int64
|
var tsf, dsz, ssz int64
|
||||||
for _, f := range handler.manager.files {
|
for _, f := range handler.manager.files {
|
||||||
if err = f.close(); err != nil {
|
if rc == 0 { // no error has yet occurred report errors closing files
|
||||||
return err, 1
|
if cerr := f.close(); cerr != nil {
|
||||||
|
return cerr, 1
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if f.expect_diff {
|
if f.expect_diff {
|
||||||
tsf += f.expected_size
|
tsf += f.expected_size
|
||||||
|
|||||||
Reference in New Issue
Block a user