diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-03-17 13:54:56 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-03-17 13:54:56 +0900 |
| commit | faea1f4bd607263c59af8f228c97e9406ba482a7 (patch) | |
| tree | a505e5fe36a2f7b6496b1a6a72aaafe62355d9dd /helper | |
| parent | 0cb1007daaea2b8f6b28bff72aa5d08aea981ea9 (diff) | |
all: remove deprecated packages
Closes #24.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'helper')
| -rw-r--r-- | helper/deprecated.go | 73 | ||||
| -rw-r--r-- | helper/proc/deprecated.go | 63 |
2 files changed, 0 insertions, 136 deletions
diff --git a/helper/deprecated.go b/helper/deprecated.go deleted file mode 100644 index f09b0c84..00000000 --- a/helper/deprecated.go +++ /dev/null @@ -1,73 +0,0 @@ -// Package helper exposes the internal/helper package. -// -// Deprecated: This package will be removed in 0.4. -package helper - -import ( - "context" - "io" - "os" - "os/exec" - "time" - _ "unsafe" // for go:linkname - - "hakurei.app/container" - "hakurei.app/container/check" - "hakurei.app/internal/helper" - "hakurei.app/message" -) - -//go:linkname WaitDelay hakurei.app/internal/helper.WaitDelay -var WaitDelay time.Duration - -const ( - // HakureiHelper is set to 1 when args fd is enabled and 0 otherwise. - HakureiHelper = helper.HakureiHelper - // HakureiStatus is set to 1 when stat fd is enabled and 0 otherwise. - HakureiStatus = helper.HakureiStatus -) - -type Helper = helper.Helper - -// NewCheckedArgs returns a checked null-terminated argument writer for a copy of args. -// -//go:linkname NewCheckedArgs hakurei.app/internal/helper.NewCheckedArgs -func NewCheckedArgs(args ...string) (wt io.WriterTo, err error) - -// MustNewCheckedArgs returns a checked null-terminated argument writer for a copy of args. -// If s contains a NUL byte this function panics instead of returning an error. -// -//go:linkname MustNewCheckedArgs hakurei.app/internal/helper.MustNewCheckedArgs -func MustNewCheckedArgs(args ...string) io.WriterTo - -// NewDirect initialises a new direct Helper instance with wt as the null-terminated argument writer. -// Function argF returns an array of arguments passed directly to the child process. -// -//go:linkname NewDirect hakurei.app/internal/helper.NewDirect -func NewDirect( - ctx context.Context, - name string, - wt io.WriterTo, - stat bool, - argF func(argsFd, statFd int) []string, - cmdF func(cmd *exec.Cmd), - extraFiles []*os.File, -) Helper - -// New initialises a Helper instance with wt as the null-terminated argument writer. -// -//go:linkname New hakurei.app/internal/helper.New -func New( - ctx context.Context, - msg message.Msg, - pathname *check.Absolute, name string, - wt io.WriterTo, - stat bool, - argF func(argsFd, statFd int) []string, - cmdF func(z *container.Container), - extraFiles []*os.File, -) Helper - -// InternalHelperStub is an internal function but exported because it is cross-package; -// it is part of the implementation of the helper stub. -func InternalHelperStub() { helper.InternalHelperStub() } diff --git a/helper/proc/deprecated.go b/helper/proc/deprecated.go deleted file mode 100644 index 91897526..00000000 --- a/helper/proc/deprecated.go +++ /dev/null @@ -1,63 +0,0 @@ -// Deprecated: This package will be removed in 0.4. -package proc - -import ( - "context" - "io" - "os" - "os/exec" - "time" - _ "unsafe" // for go:linkname - - "hakurei.app/internal/helper/proc" -) - -//go:linkname FulfillmentTimeout hakurei.app/internal/helper/proc.FulfillmentTimeout -var FulfillmentTimeout time.Duration - -// A File is an extra file with deferred initialisation. -type File = proc.File - -// ExtraFilesPre is a linked list storing addresses of [os.File]. -type ExtraFilesPre = proc.ExtraFilesPre - -// Fulfill calls the [File.Fulfill] method on all files, starts cmd and blocks until all fulfillment completes. -// -//go:linkname Fulfill hakurei.app/internal/helper/proc.Fulfill -func Fulfill(ctx context.Context, - v *[]*os.File, start func() error, - files []File, extraFiles *ExtraFilesPre, -) (err error) - -// InitFile initialises f as part of the slice extraFiles points to, -// and returns its final fd value. -// -//go:linkname InitFile hakurei.app/internal/helper/proc.InitFile -func InitFile(f File, extraFiles *ExtraFilesPre) (fd uintptr) - -// BaseFile implements the Init method of the File interface and provides indirect access to extra file state. -type BaseFile = proc.BaseFile - -//go:linkname ExtraFile hakurei.app/internal/helper/proc.ExtraFile -func ExtraFile(cmd *exec.Cmd, f *os.File) (fd uintptr) - -//go:linkname ExtraFileSlice hakurei.app/internal/helper/proc.ExtraFileSlice -func ExtraFileSlice(extraFiles *[]*os.File, f *os.File) (fd uintptr) - -// NewWriterTo returns a [File] that receives content from wt on fulfillment. -// -//go:linkname NewWriterTo hakurei.app/internal/helper/proc.NewWriterTo -func NewWriterTo(wt io.WriterTo) File - -// NewStat returns a [File] implementing the behaviour -// of the receiving end of xdg-dbus-proxy stat fd. -// -//go:linkname NewStat hakurei.app/internal/helper/proc.NewStat -func NewStat(s *io.Closer) File - -var ( - //go:linkname ErrStatFault hakurei.app/internal/helper/proc.ErrStatFault - ErrStatFault error - //go:linkname ErrStatRead hakurei.app/internal/helper/proc.ErrStatRead - ErrStatRead error -) |
