Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-21 16:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove dependency on SysProcAttr

Browse Source
This commit is contained in:
sawka 2024-06-12 11:33:45 -07:00
parent dab48497c1
commit c139a33954
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/shellexec/shellexec.go
View File

@ -9,6 +9,7 @@ import (
"io"
"os"
"os/exec"
"reflect"
"syscall"
"github.com/creack/pty"
@ -34,6 +35,18 @@ func (sp *ShellProc) Close() {
}()
}
func setBoolConditionally(rval reflect.Value, field string, value bool) {
if rval.Elem().FieldByName(field).IsValid() {
rval.Elem().FieldByName(field).SetBool(value)
}
}
func setSysProcAttrs(cmd *exec.Cmd) {
rval := reflect.ValueOf(cmd.SysProcAttr)
setBoolConditionally(rval, "Setsid", true)
setBoolConditionally(rval, "Setctty", true)
}
func StartShellProc(termSize TermSize) (*ShellProc, error) {
shellPath := shellutil.DetectLocalShellPath()
ecmd := exec.Command(shellPath, "-i", "-l")
@ -60,8 +73,7 @@ func StartShellProc(termSize TermSize) (*ShellProc, error) {
ecmd.Stdout = cmdTty
ecmd.Stderr = cmdTty
ecmd.SysProcAttr = &syscall.SysProcAttr{}
ecmd.SysProcAttr.Setsid = true
ecmd.SysProcAttr.Setctty = true
setSysProcAttrs(ecmd)
err = ecmd.Start()
cmdTty.Close()
if err != nil {
@ -90,8 +102,7 @@ func RunSimpleCmdInPty(ecmd *exec.Cmd, termSize TermSize) ([]byte, error) {
ecmd.Stdout = cmdTty
ecmd.Stderr = cmdTty
ecmd.SysProcAttr = &syscall.SysProcAttr{}
ecmd.SysProcAttr.Setsid = true
ecmd.SysProcAttr.Setctty = true
setSysProcAttrs(ecmd)
err = ecmd.Start()
cmdTty.Close()
if err != nil {