mirrors/stfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add read-only support for existing tar archives from GNU tar

Browse Source
This commit is contained in:
Felicitas Pojtinger
2022-01-25 02:12:36 +01:00
parent 247bd37756
commit 9814937e2d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/persisters/metadata.go
View File

@@ -511,7 +511,7 @@ func (p *MetadataPersister) headerExistsExact(ctx context.Context, name string)
func (p *MetadataPersister) getSanitizedPath(ctx context.Context, name string) string { func (p *MetadataPersister) getSanitizedPath(ctx context.Context, name string) string {
// If root is queried, return actual root // If root is queried, return actual root
if pathext.IsRoot(name, false) { if pathext.IsRoot(name, false) || name == p.root {
return p.root return p.root
} }
@@ -537,8 +537,12 @@ func (p *MetadataPersister) getSanitizedPath(ctx context.Context, name string) s
prefix = "" prefix = ""
} else if p.root == "." { } else if p.root == "." {
prefix = "." prefix = "."
} else if p.root == "./" {
return "./" + strings.TrimPrefix(strings.TrimPrefix(name, "./"), "/") // // If the root path is "./"; this is `tar`s default behaviour if . is the source
} else if p.root == "/" { } else if p.root == "/" {
prefix = "/" prefix = "/"
} else if !(strings.HasPrefix(p.root, "/") || strings.HasPrefix(p.root, "./")) { // If the root path is relative, but does not start with "./"; this is `tar`s default behaviour if ${PWD} is the source
return name
} else { } else {
return "./" + filepath.Clean(strings.TrimPrefix(name, "/")) // Special case: There is no root directory, only files, and the files start with `./` return "./" + filepath.Clean(strings.TrimPrefix(name, "/")) // Special case: There is no root directory, only files, and the files start with `./`
} }