Commitf4c18cf

committed

fix: Resolve symlinks being written with size 0 in tar (#1488)

1 parentfd79d2c commitf4c18cfCopy full SHA for f4c18cf

File tree

-2

lines changed

-2

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,14 @@ func Tar(directory string, limit int64) ([]byte, error) {`
`25`	`25`	`iferr!=nil {`
`26`	`26`	`returnerr`
`27`	`27`	`}`
`28`		`-header,err:=tar.FileInfoHeader(fileInfo,file)`
	`28`	`+varlinkstring`
	`29`	`+iffileInfo.Mode()&os.ModeSymlink==os.ModeSymlink {`
	`30`	`+link,err=os.Readlink(file)`
	`31`	`+iferr!=nil {`
	`32`	`+returnerr`
	`33`	`+}`
	`34`	`+}`
	`35`	`+header,err:=tar.FileInfoHeader(fileInfo,link)`
`29`	`36`	`iferr!=nil {`
`30`	`37`	`returnerr`
`31`	`38`	`}`
`@@ -45,7 +52,7 @@ func Tar(directory string, limit int64) ([]byte, error) {`
`45`	`52`	`iferr:=tarWriter.WriteHeader(header);err!=nil {`
`46`	`53`	`returnerr`
`47`	`54`	`}`
`48`		`-iffileInfo.IsDir() {`
	`55`	`+if!fileInfo.Mode().IsRegular() {`
`49`	`56`	`returnnil`
`50`	`57`	`}`
`51`	`58`	`data,err:=os.Open(file)`

Comments

(0)