diff options
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/output.go | 4 | ||||
| -rw-r--r-- | internal/path.go | 6 | ||||
| -rw-r--r-- | internal/sys/std.go | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/internal/output.go b/internal/output.go index 36eb8105..a15be77d 100644 --- a/internal/output.go +++ b/internal/output.go @@ -1,13 +1,13 @@ package internal import ( + "git.gensokyo.uk/security/hakurei" "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/sandbox" "git.gensokyo.uk/security/hakurei/system" ) func InstallOutput(verbose bool) { hlog.Store(verbose) - sandbox.SetOutput(hlog.Output{}) + hakurei.SetOutput(hlog.Output{}) system.SetOutput(hlog.Output{}) } diff --git a/internal/path.go b/internal/path.go index 6b7b2200..e910287a 100644 --- a/internal/path.go +++ b/internal/path.go @@ -8,12 +8,12 @@ import ( ) var ( - hakurei = compPoison - hsu = compPoison + hmain = compPoison + hsu = compPoison ) func MustHakureiPath() string { - if name, ok := checkPath(hakurei); ok { + if name, ok := checkPath(hmain); ok { return name } hlog.BeforeExit() diff --git a/internal/sys/std.go b/internal/sys/std.go index c3913a75..098eb3cf 100644 --- a/internal/sys/std.go +++ b/internal/sys/std.go @@ -12,10 +12,10 @@ import ( "sync" "syscall" + "git.gensokyo.uk/security/hakurei" "git.gensokyo.uk/security/hakurei/hst" "git.gensokyo.uk/security/hakurei/internal" "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/sandbox" ) // Std implements System using the standard library. @@ -36,7 +36,7 @@ func (s *Std) Getgid() int { return os.Getgid() func (s *Std) LookupEnv(key string) (string, bool) { return os.LookupEnv(key) } func (s *Std) TempDir() string { return os.TempDir() } func (s *Std) LookPath(file string) (string, error) { return exec.LookPath(file) } -func (s *Std) MustExecutable() string { return sandbox.MustExecutable() } +func (s *Std) MustExecutable() string { return hakurei.MustExecutable() } func (s *Std) LookupGroup(name string) (*user.Group, error) { return user.LookupGroup(name) } func (s *Std) ReadDir(name string) ([]os.DirEntry, error) { return os.ReadDir(name) } func (s *Std) Stat(name string) (fs.FileInfo, error) { return os.Stat(name) } |