From 000607da5fca0e101cb43db9b1c1b466e3292d35 Mon Sep 17 00:00:00 2001
From: Ophestra Umiker <cat@ophivana.moe>
Date: Tue, 24 Sep 2024 16:11:08 +0900
Subject: helper: separate helper args fd builder from dbus

This method of passing arguments is used in bubblewrap as well as other tools, this commit separates the argument builder/writer to the helper package and generalise it as an interface.

Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
---
 dbus/setup.go | 84 -----------------------------------------------------------
 1 file changed, 84 deletions(-)
 delete mode 100644 dbus/setup.go

(limited to 'dbus/setup.go')

diff --git a/dbus/setup.go b/dbus/setup.go
deleted file mode 100644
index 2fb7c797..00000000
--- a/dbus/setup.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package dbus
-
-import (
-	"errors"
-	"os"
-	"os/exec"
-	"strings"
-	"sync"
-)
-
-// Proxy holds references to a xdg-dbus-proxy process, and should never be copied.
-// Once sealed, configuration changes will no longer be possible and attempting to do so will result in a panic.
-type Proxy struct {
-	cmd *exec.Cmd
-
-	statP [2]*os.File
-	argsP [2]*os.File
-
-	path    string
-	session [2]string
-	system  [2]string
-
-	wait  *chan error
-	read  *chan error
-	ready *chan bool
-
-	seal *string
-	lock sync.RWMutex
-}
-
-func (p *Proxy) String() string {
-	if p == nil {
-		return "(invalid dbus proxy)"
-	}
-
-	p.lock.RLock()
-	defer p.lock.RUnlock()
-
-	if p.cmd != nil {
-		return p.cmd.String()
-	}
-
-	if p.seal != nil {
-		return *p.seal
-	}
-
-	return "(unsealed dbus proxy)"
-}
-
-// Seal seals the Proxy instance.
-func (p *Proxy) Seal(session, system *Config) error {
-	p.lock.Lock()
-	defer p.lock.Unlock()
-
-	if p.seal != nil {
-		panic("dbus proxy sealed twice")
-	}
-
-	if session == nil && system == nil {
-		return errors.New("no configuration to seal")
-	}
-
-	seal := strings.Builder{}
-
-	if session != nil {
-		if err := session.buildSeal(&seal, p.session); err != nil {
-			return err
-		}
-	}
-	if system != nil {
-		if err := system.buildSeal(&seal, p.system); err != nil {
-			return err
-		}
-	}
-
-	v := seal.String()
-	p.seal = &v
-	return nil
-}
-
-// New returns a reference to a new unsealed Proxy.
-func New(binPath string, session, system [2]string) *Proxy {
-	return &Proxy{path: binPath, session: session, system: system}
-}
-- 
cgit v1.3.1