go/goreleaser
go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-03-17 20:47:50 +02:00
Code Issues Releases Activity

fix: improve tar error handling

Browse Source
This commit is contained in:
Carlos A Becker 2022-08-22 22:06:20 -03:00
parent 0325b0485b
commit ff0eeaca35
No known key found for this signature in database
GPG Key ID: E61E2F7DC14AB940
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/archive/tar/tar.go
View File

@ -3,6 +3,7 @@ package tar
import (
"archive/tar"
"fmt"
"io"
"os"
@ -30,18 +31,18 @@ func (a Archive) Close() error {
func (a Archive) Add(f config.File) error {
info, err := os.Lstat(f.Source) // #nosec
if err != nil {
return err
return fmt.Errorf("%s: %w", f.Source, err)
}
var link string
if info.Mode()&os.ModeSymlink != 0 {
link, err = os.Readlink(f.Source) // #nosec
if err != nil {
return err
return fmt.Errorf("%s: %w", f.Source, err)
}
}
header, err := tar.FileInfoHeader(info, link)
if err != nil {
return err
return fmt.Errorf("%s: %w", f.Source, err)
}
header.Name = f.Destination
if !f.Info.MTime.IsZero() {
@ -59,16 +60,18 @@ func (a Archive) Add(f config.File) error {
header.Gname = f.Info.Group
}
if err = a.tw.WriteHeader(header); err != nil {
return err
return fmt.Errorf("%s: %w", f.Source, err)
}
if info.IsDir() || info.Mode()&os.ModeSymlink != 0 {
return nil
}
file, err := os.Open(f.Source) // #nosec
if err != nil {
return err
return fmt.Errorf("%s: %w", f.Source, err)
}
defer file.Close()
_, err = io.Copy(a.tw, file)
return err
if _, err := io.Copy(a.tw, file); err != nil {
return fmt.Errorf("%s: %w", f.Source, err)
}
return nil
}