Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions 7zip.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ func unpack7Zip(ctx context.Context, t Target, dst string, src io.Reader, cfg *C
}
defer func() {
if f, ok := sra.(*os.File); ok {
f.Close()
os.Remove(f.Name())
_ = f.Close()
_ = os.Remove(f.Name())
}
}()

Expand Down Expand Up @@ -131,7 +131,7 @@ func (z *sevenZipEntry) Linkname() string {
if err != nil {
return ""
}
defer f.Close()
defer func() { _ = f.Close() }()
c, err := io.ReadAll(f)
if err != nil {
return ""
Expand Down
2 changes: 1 addition & 1 deletion cmd/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func Run(version, commit, date string) {
logger.Error("opening archive failed", "err", err)
os.Exit(-1)
} else {
defer archive.(*os.File).Close()
defer func() { _ = archive.(*os.File).Close() }()
}
}

Expand Down
2 changes: 1 addition & 1 deletion decompress.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func decompress(ctx context.Context, t Target, dst string, src io.Reader, cfg *C
}
defer func() {
if closer, ok := decompressedStream.(io.Closer); ok {
closer.Close()
_ = closer.Close()
}
}()
// check if context is canceled
Expand Down
8 changes: 4 additions & 4 deletions extractor.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func (e extractors) GetUnpackFunctionByFileName(name string) unpackFunc {
ext := strings.ToLower(name)
if strings.Contains(ext, ".") {
ext = filepath.Ext(ext)
ext = strings.Replace(ext, ".", "", -1) // remove leading dot if the file extension is the only part of the file name (e.g. ".tar")
ext = strings.ReplaceAll(ext, ".", "") // remove leading dot if the file extension is the only part of the file name (e.g. ".tar")
}

if ae, found := e[ext]; found {
Expand Down Expand Up @@ -363,7 +363,7 @@ func extract(ctx context.Context, t Target, dst string, src archiveWalker, cfg *
if err != nil {
return handleError(cfg, td, "failed to open file", err), false
}
defer fin.Close()
defer func() { _ = fin.Close() }()

// create file
n, err := createFile(t, dst, ae.Name(), fin, ae.Mode(), cfg.MaxExtractionSize()-extractionSize, cfg)
Expand Down Expand Up @@ -520,13 +520,13 @@ func readerToReaderAtSeeker(c *Config, r io.Reader) (seekerReaderAt, error) {

// copy reader to temp file
if _, err := io.Copy(tmpFile, ler); err != nil {
defer os.Remove(tmpFile.Name())
defer func() { _ = os.Remove(tmpFile.Name()) }()
return nil, fmt.Errorf("cannot copy reader to file: %w", err)
}

// seek to start
if _, err := tmpFile.Seek(0, io.SeekStart); err != nil {
defer os.Remove(tmpFile.Name())
defer func() { _ = os.Remove(tmpFile.Name()) }()
return nil, err
}

Expand Down
2 changes: 1 addition & 1 deletion rar.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func processRar(ctx context.Context, t Target, dst string, src io.Reader, cfg *C
if err != nil {
return handleError(cfg, td, "cannot create rar decoder", err)
}
defer a.Close()
defer func() { _ = a.Close() }()
return extract(ctx, t, dst, &rarWalker{&a.Reader}, cfg, td)
}

Expand Down
2 changes: 1 addition & 1 deletion target_disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (d *TargetDisk) CreateFile(path string, src io.Reader, mode fs.FileMode, ov
return 0, fmt.Errorf("failed to create file: %w", err)
}
defer func() {
dstFile.Close()
_ = dstFile.Close()
}()

// write data to file
Expand Down
2 changes: 1 addition & 1 deletion target_memory.go
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ func (m *TargetMemory) ReadFile(path string) ([]byte, error) {
if err != nil {
return nil, &fs.PathError{Op: "ReadFile", Path: path, Err: fs.ErrNotExist}
}
defer f.Close()
defer func() { _ = f.Close() }()

// check if it is a directory
stat, err := f.Stat()
Expand Down
8 changes: 4 additions & 4 deletions target_memory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func TestMemoryOpen(t *testing.T) {
if err != nil {
t.Fatalf("Open() failed: %s", err)
}
defer f.Close()
defer func() { _ = f.Close() }()

// check the file permissions
stat, err := f.Stat()
Expand Down Expand Up @@ -87,7 +87,7 @@ func TestMemoryOpen(t *testing.T) {
if err != nil {
t.Fatalf("Open() failed: %s", err)
}
defer f.Close()
defer func() { _ = f.Close() }()

// read content of the symlink
data, err = io.ReadAll(f)
Expand Down Expand Up @@ -201,7 +201,7 @@ func TestMemoryOpen2(t *testing.T) {
if err != nil {
t.Fatalf("Open() failed: %s", err)
}
defer f.Close()
defer func() { _ = f.Close() }()

// read the file
data, err := io.ReadAll(f)
Expand Down Expand Up @@ -868,7 +868,7 @@ func TestUnpackToMemoryWithPreserveFileAttributesAndOwner(t *testing.T) {
if err != nil {
t.Fatalf("error getting file stats: %v", err)
}
if !(c.Mode&fs.ModeSymlink != 0) { // skip symlink checks
if c.Mode&fs.ModeSymlink == 0 { // skip symlink checks
if stat.Mode().Perm() != c.Mode.Perm() {
t.Fatalf("expected file mode %v, got %v, file %s", c.Mode.Perm(), stat.Mode().Perm(), path)
}
Expand Down
4 changes: 2 additions & 2 deletions unpack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1211,7 +1211,7 @@ func TestUnsupportedArchiveNames(t *testing.T) {
if err != nil {
t.Fatalf("error opening file: %s", err)
}
defer src.Close()
defer func() { _ = src.Close() }()
if err := extract.Unpack(ctx, tmpDir, src, extract.NewConfig()); err != nil {
t.Fatalf("error unpacking file: %s", err)
}
Expand Down Expand Up @@ -1727,7 +1727,7 @@ func asIoReader(t *testing.T, b []byte) io.Reader {
t.Helper()
r, w := io.Pipe()
go func() {
defer w.Close()
defer func() { _ = w.Close() }()
if _, err := w.Write(b); err != nil {
t.Logf("error writing data to pipe: %v", err)
t.Fail()
Expand Down
2 changes: 1 addition & 1 deletion unpack_unix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestUnpackWithPreserveFileAttributes(t *testing.T) {
if err != nil {
t.Fatalf("error getting file stats: %v", err)
}
if !(c.Mode&fs.ModeSymlink != 0) { // skip symlink checks
if c.Mode&fs.ModeSymlink == 0 { // skip symlink checks
if stat.Mode().Perm() != c.Mode.Perm() {
t.Fatalf("expected file mode %v, got %v, file %s", c.Mode.Perm(), stat.Mode().Perm(), c.Name)
}
Expand Down
12 changes: 6 additions & 6 deletions zip.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ func unpackZip(ctx context.Context, t Target, dst string, src io.Reader, c *Conf
}
defer func() {
if f, ok := src.(*os.File); ok {
f.Close()
os.Remove(f.Name())
_ = f.Close()
_ = os.Remove(f.Name())
}
}()

Expand Down Expand Up @@ -110,23 +110,23 @@ type zipEntry struct {

// Name returns the name of the entry
func (z *zipEntry) Name() string {
return z.zf.FileHeader.Name
return z.zf.Name
}

// Size returns the size of the entry
func (z *zipEntry) Size() int64 {
return int64(z.zf.FileHeader.UncompressedSize64)
return int64(z.zf.UncompressedSize64)
}

// Mode returns the mode of the entry
func (z *zipEntry) Mode() os.FileMode {
return z.zf.FileHeader.Mode()
return z.zf.Mode()
}

// Linkname returns the linkname of the entry
func (z *zipEntry) Linkname() string {
rc, _ := z.zf.Open()
defer func() { rc.Close() }()
defer func() { _ = rc.Close() }()
data, _ := io.ReadAll(rc)
return string(data)
}
Expand Down
Loading