maemachinebroke/hakurei
1
0
Fork 0
forked from security/hakurei
Code Pull Requests Activity

container/check: relocate overlay escape

Browse Source 
This is used in hst to format strings.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2025-10-07 23:56:19 +09:00
parent 584ce3da68
commit 1f0226f7e0
7 changed files with 71 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
hst/fsoverlay.go
View File

@@ -4,7 +4,6 @@ import (
"encoding/gob"
"strings"
"hakurei.app/container"
"hakurei.app/container/check"
)
@@ -82,18 +81,18 @@ func (o *FSOverlay) String() string {
lower := make([]string, len(o.Lower))
for i, a := range o.Lower {
lower[i] = container.EscapeOverlayDataSegment(a.String())
lower[i] = check.EscapeOverlayDataSegment(a.String())
}
if o.Upper != nil && o.Work != nil {
return "w*" + strings.Join(append([]string{
container.EscapeOverlayDataSegment(o.Target.String()),
container.EscapeOverlayDataSegment(o.Upper.String()),
container.EscapeOverlayDataSegment(o.Work.String())},
lower...), container.SpecialOverlayPath)
check.EscapeOverlayDataSegment(o.Target.String()),
check.EscapeOverlayDataSegment(o.Upper.String()),
check.EscapeOverlayDataSegment(o.Work.String())},
lower...), check.SpecialOverlayPath)
} else {
return "*" + strings.Join(append([]string{
container.EscapeOverlayDataSegment(o.Target.String())},
lower...), container.SpecialOverlayPath)
check.EscapeOverlayDataSegment(o.Target.String())},
lower...), check.SpecialOverlayPath)
}
}