From 6309469e933a31a300fbf16d8e77f48dcee402d3 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 12 Apr 2025 13:56:41 +0900 Subject: app/instance: wrap internal implementation This reduces the scope of the fst package, which was growing questionably large. Signed-off-by: Ophestra --- internal/sys/interface.go | 6 +++--- internal/sys/std.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'internal/sys') diff --git a/internal/sys/interface.go b/internal/sys/interface.go index 88afd670..ba8e0bf4 100644 --- a/internal/sys/interface.go +++ b/internal/sys/interface.go @@ -6,7 +6,7 @@ import ( "path" "strconv" - "git.gensokyo.uk/security/fortify/fst" + "git.gensokyo.uk/security/fortify/internal/app" "git.gensokyo.uk/security/fortify/internal/fmsg" ) @@ -41,14 +41,14 @@ type State interface { Printf(format string, v ...any) // Paths returns a populated [Paths] struct. - Paths() fst.Paths + Paths() app.Paths // Uid invokes fsu and returns target uid. // Any errors returned by Uid is already wrapped [fmsg.BaseError]. Uid(aid int) (int, error) } // CopyPaths is a generic implementation of [fst.Paths]. -func CopyPaths(os State, v *fst.Paths) { +func CopyPaths(os State, v *app.Paths) { v.SharePath = path.Join(os.TempDir(), "fortify."+strconv.Itoa(os.Getuid())) fmsg.Verbosef("process share directory at %q", v.SharePath) diff --git a/internal/sys/std.go b/internal/sys/std.go index 5e63396b..1b235795 100644 --- a/internal/sys/std.go +++ b/internal/sys/std.go @@ -12,15 +12,15 @@ import ( "sync" "syscall" - "git.gensokyo.uk/security/fortify/fst" "git.gensokyo.uk/security/fortify/internal" + "git.gensokyo.uk/security/fortify/internal/app" "git.gensokyo.uk/security/fortify/internal/fmsg" "git.gensokyo.uk/security/fortify/sandbox" ) // Std implements System using the standard library. type Std struct { - paths fst.Paths + paths app.Paths pathsOnce sync.Once uidOnce sync.Once @@ -48,7 +48,7 @@ func (s *Std) Printf(format string, v ...any) { fmsg.Verbosef(form const xdgRuntimeDir = "XDG_RUNTIME_DIR" -func (s *Std) Paths() fst.Paths { +func (s *Std) Paths() app.Paths { s.pathsOnce.Do(func() { CopyPaths(s, &s.paths) }) return s.paths } -- cgit v1.3.1