From d0b399a86a1c671fec786e0488a05f6348e2db6f Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 15 Jan 2025 10:07:51 +0900 Subject: [PATCH] linux: wrap filepath.EvalSymlinks Signed-off-by: Ophestra --- internal/linux/interface.go | 5 ++--- internal/linux/std.go | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/internal/linux/interface.go b/internal/linux/interface.go index dd0782d..1bb87db 100644 --- a/internal/linux/interface.go +++ b/internal/linux/interface.go @@ -1,7 +1,6 @@ package linux import ( - "io" "io/fs" "os/user" "path" @@ -30,10 +29,10 @@ type System interface { Stat(name string) (fs.FileInfo, error) // Open provides [os.Open] Open(name string) (fs.File, error) + // EvalSymlinks provides [filepath.EvalSymlinks] + EvalSymlinks(path string) (string, error) // Exit provides [os.Exit]. Exit(code int) - // Stdout provides [os.Stdout]. - Stdout() io.Writer // Paths returns a populated [Paths] struct. Paths() Paths diff --git a/internal/linux/std.go b/internal/linux/std.go index a82fff2..7c6b927 100644 --- a/internal/linux/std.go +++ b/internal/linux/std.go @@ -2,11 +2,11 @@ package linux import ( "errors" - "io" "io/fs" "os" "os/exec" "os/user" + "path/filepath" "strconv" "sync" "syscall" @@ -37,8 +37,8 @@ func (s *Std) LookupGroup(name string) (*user.Group, error) { return user.Lookup 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) } func (s *Std) Open(name string) (fs.File, error) { return os.Open(name) } +func (s *Std) EvalSymlinks(path string) (string, error) { return filepath.EvalSymlinks(path) } func (s *Std) Exit(code int) { fmsg.Exit(code) } -func (s *Std) Stdout() io.Writer { return os.Stdout } const xdgRuntimeDir = "XDG_RUNTIME_DIR"