mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 15:46:26 -04:00
8ec4283e55
Windows ConPTY can't attach a child process to a pseudoconsole via os/exec — Go's stdlib doesn't expose PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE (golang/go#62708). The ConPTY path has to call CreateProcess directly, so it can't hand an *exec.Cmd back to the task runner. Widen NewCmdTask to accept a small Cmd interface satisfied by both *exec.Cmd (via the ExecCmd adapter) and the Windows ConPTY command type we're about to add. Change TerminateProcessGracefully to take *os.Process, which both cmd shapes can provide. Behavior is unchanged on every platform. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
48 lines
1.3 KiB
Go
48 lines
1.3 KiB
Go
package oscommands
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"syscall"
|
|
)
|
|
|
|
// setRawCmdLine hands cmd.exe the exact command line we built, bypassing
|
|
// os/exec's default composition (which quotes args with the
|
|
// CommandLineToArgvW `\"` convention that cmd.exe doesn't understand).
|
|
//
|
|
// The shell-building logic in NewShell is portable and dispatches on
|
|
// platform.OS, which keeps it (and its quoting) unit-testable on any host.
|
|
// Assigning SysProcAttr.CmdLine is the only step that needs a Windows-only
|
|
// field, so it's the single piece split out behind a build tag; every other
|
|
// platform gets the no-op in os_default_platform.go.
|
|
func setRawCmdLine(cmd *exec.Cmd, cmdLine string) {
|
|
if cmd.SysProcAttr == nil {
|
|
cmd.SysProcAttr = &syscall.SysProcAttr{}
|
|
}
|
|
cmd.SysProcAttr.CmdLine = cmdLine
|
|
}
|
|
|
|
func GetPlatform() *Platform {
|
|
return &Platform{
|
|
OS: "windows",
|
|
Shell: "cmd",
|
|
ShellArg: "/c",
|
|
}
|
|
}
|
|
|
|
func (c *OSCommand) UpdateWindowTitle() error {
|
|
path, getWdErr := os.Getwd()
|
|
if getWdErr != nil {
|
|
return getWdErr
|
|
}
|
|
argString := fmt.Sprint("title ", filepath.Base(path), " - Lazygit")
|
|
return c.Cmd.NewShell(argString, c.UserConfig().OS.ShellFunctionsFile).Run()
|
|
}
|
|
|
|
func TerminateProcessGracefully(proc *os.Process) error {
|
|
// Signals other than SIGKILL are not supported on Windows
|
|
return nil
|
|
}
|