Skip to content

properly set argv0 when spawning a process #3182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Midnight145 wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −0
Open

properly set argv0 when spawning a process #3182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions pkg/shellexec/shellexec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"log"
"os"
"os/exec"
"path/filepath"
"runtime"
"strings"
"sync"
Expand Down Expand Up @@ -122,6 +123,31 @@ type PipePty struct {
remoteStdoutRead *os.File
}

func setCmdArgv0FromPath(cmd *exec.Cmd) {
if cmd == nil {
return
}
execPath := cmd.Path
if execPath == "" {
if len(cmd.Args) == 0 {
return
}
execPath = cmd.Args[0]
}
if execPath == "" {
return
}
argv0 := filepath.Base(execPath)
if argv0 == "" {
return
}
if len(cmd.Args) == 0 {
cmd.Args = []string{argv0}
return
}
cmd.Args[0] = argv0
}

func (pp *PipePty) Fd() uintptr {
return pp.remoteStdinWrite.Fd()
}
Expand Down Expand Up @@ -157,6 +183,7 @@ func StartWslShellProcNoWsh(ctx context.Context, termSize waveobj.TermSize, cmdS
conn.Infof(ctx, "WSL-NEWSESSION (StartWslShellProcNoWsh)")

ecmd := exec.Command("wsl.exe", "~", "-d", client.Name())
setCmdArgv0FromPath(ecmd)

if termSize.Rows == 0 || termSize.Cols == 0 {
termSize.Rows = shellutil.DefaultTermRows
Expand Down Expand Up @@ -275,6 +302,7 @@ func StartWslShellProc(ctx context.Context, termSize waveobj.TermSize, cmdStr st
}
log.Printf("full combined command: %s", cmdCombined)
ecmd := exec.Command("wsl.exe", "~", "-d", client.Name(), "--", "sh", "-c", cmdCombined)
setCmdArgv0FromPath(ecmd)
if termSize.Rows == 0 || termSize.Cols == 0 {
termSize.Rows = shellutil.DefaultTermRows
termSize.Cols = shellutil.DefaultTermCols
Expand Down Expand Up @@ -619,6 +647,7 @@ func StartLocalShellProc(logCtx context.Context, termSize waveobj.TermSize, cmdS
}
blocklogger.Debugf(logCtx, "[conndebug] shell:%s shellOpts:%v\n", shellPath, shellOpts)
ecmd = exec.Command(shellPath, shellOpts...)
setCmdArgv0FromPath(ecmd)
ecmd.Env = os.Environ()
if shellType == shellutil.ShellType_zsh {
shellutil.UpdateCmdEnv(ecmd, map[string]string{"ZDOTDIR": shellutil.GetLocalZshZDotDir()})
Expand All @@ -627,6 +656,7 @@ func StartLocalShellProc(logCtx context.Context, termSize waveobj.TermSize, cmdS
isShell = false
shellOpts = append(shellOpts, "-c", cmdStr)
ecmd = exec.Command(shellPath, shellOpts...)
setCmdArgv0FromPath(ecmd)
ecmd.Env = os.Environ()
}

Expand Down Expand Up @@ -693,6 +723,7 @@ func StartLocalShellProc(logCtx context.Context, termSize waveobj.TermSize, cmdS
}

func RunSimpleCmdInPty(ecmd *exec.Cmd, termSize waveobj.TermSize) ([]byte, error) {
setCmdArgv0FromPath(ecmd)
ecmd.Env = os.Environ()
shellutil.UpdateCmdEnv(ecmd, shellutil.WaveshellLocalEnvVars(shellutil.DefaultTermType))
if termSize.Rows == 0 || termSize.Cols == 0 {
Expand Down