From e599b5583dd821ed26bdfc01f7f67d4a317b9843 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sun, 16 Feb 2025 17:26:09 +0900 Subject: fmsg: implement suspend in writer This removes the requirement to call fmsg.Exit on every exit path, and enables direct use of the "log" package. However, fmsg.BeforeExit is still encouraged when possible to catch exit on suspended output. Signed-off-by: Ophestra --- cmd/fpkg/start.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cmd/fpkg/start.go') diff --git a/cmd/fpkg/start.go b/cmd/fpkg/start.go index 4a882110..71e00281 100644 --- a/cmd/fpkg/start.go +++ b/cmd/fpkg/start.go @@ -2,11 +2,12 @@ package main import ( "flag" + "log" "path" "git.gensokyo.uk/security/fortify/fst" "git.gensokyo.uk/security/fortify/helper/bwrap" - "git.gensokyo.uk/security/fortify/internal/fmsg" + "git.gensokyo.uk/security/fortify/internal" ) func actionStart(args []string) { @@ -26,7 +27,7 @@ func actionStart(args []string) { args = set.Args() if len(args) < 1 { - fmsg.Fatal("invalid argument") + log.Fatal("invalid argument") } /* @@ -37,7 +38,7 @@ func actionStart(args []string) { pathSet := pathSetByApp(id) app := loadBundleInfo(pathSet.metaPath, func() {}) if app.ID != id { - fmsg.Fatalf("app %q claims to have identifier %q", id, app.ID) + log.Fatalf("app %q claims to have identifier %q", id, app.ID) } /* @@ -144,7 +145,7 @@ func actionStart(args []string) { */ fortifyApp(config, func() {}) - fmsg.Exit(0) + internal.Exit(0) } func appendGPUFilesystem(config *fst.Config) { -- cgit v1.3.1