From 8fa5ca4cd697809f79c3b35b841b3e4daf98cd3d Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 10 Dec 2024 22:02:15 +0100 Subject: [PATCH] chunked, dump: use CleanAbsPath replacing the usage of a private function. Signed-off-by: Giuseppe Scrivano --- pkg/chunked/dump/dump.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkg/chunked/dump/dump.go b/pkg/chunked/dump/dump.go index d98cee09de..7b58eb4835 100644 --- a/pkg/chunked/dump/dump.go +++ b/pkg/chunked/dump/dump.go @@ -13,6 +13,7 @@ import ( "time" "github.com/containers/storage/pkg/chunked/internal" + storagePath "github.com/containers/storage/pkg/chunked/internal/path" "golang.org/x/sys/unix" ) @@ -103,18 +104,8 @@ func getStMode(mode uint32, typ string) (uint32, error) { return mode, nil } -func sanitizeName(name string) string { - path := filepath.Clean(name) - if path == "." { - path = "/" - } else if path[0] != '/' { - path = "/" + path - } - return path -} - func dumpNode(out io.Writer, added map[string]*internal.FileMetadata, links map[string]int, verityDigests map[string]string, entry *internal.FileMetadata) error { - path := sanitizeName(entry.Name) + path := storagePath.CleanAbsPath(entry.Name) parent := filepath.Dir(path) if _, found := added[parent]; !found && path != "/" { @@ -172,7 +163,7 @@ func dumpNode(out io.Writer, added map[string]*internal.FileMetadata, links map[ if entry.Type == internal.TypeSymlink { payload = entry.Linkname } else { - payload = sanitizeName(entry.Linkname) + payload = storagePath.CleanAbsPath(entry.Linkname) } } else { if len(entry.Digest) > 10 {