diff options
Diffstat (limited to 'ldd')
| -rw-r--r-- | ldd/exec.go | 5 | ||||
| -rw-r--r-- | ldd/path.go | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/ldd/exec.go b/ldd/exec.go index b562316a..77b46ded 100644 --- a/ldd/exec.go +++ b/ldd/exec.go @@ -10,6 +10,7 @@ import ( "hakurei.app/container" "hakurei.app/container/bits" + "hakurei.app/container/check" "hakurei.app/container/seccomp" ) @@ -27,10 +28,10 @@ func Exec(ctx context.Context, msg container.Msg, p string) ([]*Entry, error) { c, cancel := context.WithTimeout(ctx, lddTimeout) defer cancel() - var toolPath *container.Absolute + var toolPath *check.Absolute if s, err := exec.LookPath(lddName); err != nil { return nil, err - } else if toolPath, err = container.NewAbs(s); err != nil { + } else if toolPath, err = check.NewAbs(s); err != nil { return nil, err } diff --git a/ldd/path.go b/ldd/path.go index a0cdb120..c8290c34 100644 --- a/ldd/path.go +++ b/ldd/path.go @@ -1,20 +1,20 @@ package ldd import ( - "hakurei.app/container" + "hakurei.app/container/check" ) // Path returns a deterministic, deduplicated slice of absolute directory paths in entries. -func Path(entries []*Entry) []*container.Absolute { - p := make([]*container.Absolute, 0, len(entries)*2) +func Path(entries []*Entry) []*check.Absolute { + p := make([]*check.Absolute, 0, len(entries)*2) for _, entry := range entries { - if a, err := container.NewAbs(entry.Path); err == nil { + if a, err := check.NewAbs(entry.Path); err == nil { p = append(p, a.Dir()) } - if a, err := container.NewAbs(entry.Name); err == nil { + if a, err := check.NewAbs(entry.Name); err == nil { p = append(p, a.Dir()) } } - container.SortAbs(p) - return container.CompactAbs(p) + check.SortAbs(p) + return check.CompactAbs(p) } |