diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-02-17 17:54:28 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-02-17 18:17:55 +0900 |
| commit | b1e1d5627e6532ec719c761846d7f38fe93fcadd (patch) | |
| tree | 2a308de9ee6a53b536ad00877158dc959e9cdea4 /internal/system/acl.go | |
| parent | 3ae2ab652e9cd1d6250dbde8ae0f9b9fe90afc72 (diff) | |
system: wrap console output functions
This eliminates all fmsg imports from internal/system.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/system/acl.go')
| -rw-r--r-- | internal/system/acl.go | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/internal/system/acl.go b/internal/system/acl.go index e6e6e370..840c3971 100644 --- a/internal/system/acl.go +++ b/internal/system/acl.go @@ -5,7 +5,6 @@ import ( "slices" "git.gensokyo.uk/security/fortify/acl" - "git.gensokyo.uk/security/fortify/internal/fmsg" ) // UpdatePerm appends an ephemeral acl update Op. @@ -31,23 +30,21 @@ type ACL struct { perms acl.Perms } -func (a *ACL) Type() Enablement { - return a.et -} +func (a *ACL) Type() Enablement { return a.et } func (a *ACL) apply(sys *I) error { - fmsg.Verbose("applying ACL", a) - return fmsg.WrapErrorSuffix(acl.UpdatePerm(a.path, sys.uid, a.perms...), + sys.println("applying ACL", a) + return sys.wrapErrSuffix(acl.UpdatePerm(a.path, sys.uid, a.perms...), fmt.Sprintf("cannot apply ACL entry to %q:", a.path)) } func (a *ACL) revert(sys *I, ec *Criteria) error { if ec.hasType(a) { - fmsg.Verbose("stripping ACL", a) - return fmsg.WrapErrorSuffix(acl.UpdatePerm(a.path, sys.uid), + sys.println("stripping ACL", a) + return sys.wrapErrSuffix(acl.UpdatePerm(a.path, sys.uid), fmt.Sprintf("cannot strip ACL entry from %q:", a.path)) } else { - fmsg.Verbose("skipping ACL", a) + sys.println("skipping ACL", a) return nil } } @@ -60,9 +57,7 @@ func (a *ACL) Is(o Op) bool { slices.Equal(a.perms, a0.perms) } -func (a *ACL) Path() string { - return a.path -} +func (a *ACL) Path() string { return a.path } func (a *ACL) String() string { return fmt.Sprintf("%s type: %s path: %q", |