container: export overlay escape
All checks were successful
Test / Sandbox (push) Successful in 2m21s
Test / Hakurei (push) Successful in 3m23s
Test / Sandbox (race detector) (push) Successful in 4m22s
Test / Hpkg (push) Successful in 4m14s
Test / Hakurei (race detector) (push) Successful in 5m8s
Test / Flake checks (push) Successful in 1m22s
Test / Create distribution (push) Successful in 37s
All checks were successful
Test / Sandbox (push) Successful in 2m21s
Test / Hakurei (push) Successful in 3m23s
Test / Sandbox (race detector) (push) Successful in 4m22s
Test / Hpkg (push) Successful in 4m14s
Test / Hakurei (race detector) (push) Successful in 5m8s
Test / Flake checks (push) Successful in 1m22s
Test / Create distribution (push) Successful in 37s
Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
parent
0e543a58b3
commit
ba3227bf15
@ -214,8 +214,8 @@ func parentPerm(perm os.FileMode) os.FileMode {
|
|||||||
return os.FileMode(pperm)
|
return os.FileMode(pperm)
|
||||||
}
|
}
|
||||||
|
|
||||||
// escapeOverlayDataSegment escapes a string for formatting into the data argument of an overlay mount call.
|
// EscapeOverlayDataSegment escapes a string for formatting into the data argument of an overlay mount call.
|
||||||
func escapeOverlayDataSegment(s string) string {
|
func EscapeOverlayDataSegment(s string) string {
|
||||||
if s == zeroString {
|
if s == zeroString {
|
||||||
return zeroString
|
return zeroString
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,7 @@ func TestEscapeOverlayDataSegment(t *testing.T) {
|
|||||||
|
|
||||||
for _, tc := range testCases {
|
for _, tc := range testCases {
|
||||||
t.Run(tc.name, func(t *testing.T) {
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
if got := escapeOverlayDataSegment(tc.s); got != tc.want {
|
if got := EscapeOverlayDataSegment(tc.s); got != tc.want {
|
||||||
t.Errorf("escapeOverlayDataSegment: %s, want %s", got, tc.want)
|
t.Errorf("escapeOverlayDataSegment: %s, want %s", got, tc.want)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -416,7 +416,7 @@ func (o *MountOverlayOp) early(*Params) error {
|
|||||||
if v, err := filepath.EvalSymlinks(o.Upper.String()); err != nil {
|
if v, err := filepath.EvalSymlinks(o.Upper.String()); err != nil {
|
||||||
return wrapErrSelf(err)
|
return wrapErrSelf(err)
|
||||||
} else {
|
} else {
|
||||||
o.upper = escapeOverlayDataSegment(toHost(v))
|
o.upper = EscapeOverlayDataSegment(toHost(v))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -424,7 +424,7 @@ func (o *MountOverlayOp) early(*Params) error {
|
|||||||
if v, err := filepath.EvalSymlinks(o.Work.String()); err != nil {
|
if v, err := filepath.EvalSymlinks(o.Work.String()); err != nil {
|
||||||
return wrapErrSelf(err)
|
return wrapErrSelf(err)
|
||||||
} else {
|
} else {
|
||||||
o.work = escapeOverlayDataSegment(toHost(v))
|
o.work = EscapeOverlayDataSegment(toHost(v))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -438,7 +438,7 @@ func (o *MountOverlayOp) early(*Params) error {
|
|||||||
if v, err := filepath.EvalSymlinks(a.String()); err != nil {
|
if v, err := filepath.EvalSymlinks(a.String()); err != nil {
|
||||||
return wrapErrSelf(err)
|
return wrapErrSelf(err)
|
||||||
} else {
|
} else {
|
||||||
o.lower[i] = escapeOverlayDataSegment(toHost(v))
|
o.lower[i] = EscapeOverlayDataSegment(toHost(v))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
@ -38,5 +38,5 @@ func TestToHost(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// InternalToHostOvlEscape exports toHost passed to escapeOverlayDataSegment.
|
// InternalToHostOvlEscape exports toHost passed to EscapeOverlayDataSegment.
|
||||||
func InternalToHostOvlEscape(s string) string { return escapeOverlayDataSegment(toHost(s)) }
|
func InternalToHostOvlEscape(s string) string { return EscapeOverlayDataSegment(toHost(s)) }
|
||||||
|
Loading…
x
Reference in New Issue
Block a user