Skip to content

Correct file descriptors on Windows #40

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

Merged
btoews merged 2 commits into from
Dec 4, 2018
Merged

Correct file descriptors on Windows #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05e42ea
stdout/stderr aren't fd 1/2 in Windows. Work around this
btoews Nov 29, 2018
efb92bc
constants for unixStdout and unixStderr
btoews Dec 4, 2018
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
37 changes: 26 additions & 11 deletions status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,37 @@ const (
)

var (
setupStatus sync.Once
statusFile *os.File
_setupStatus sync.Once
statusFile *os.File
)

func (s status) emitf(format string, args ...interface{}) {
setupStatus.Do(func() {
if *statusFdOpt > 0 {
func setupStatus() {
_setupStatus.Do(func() {
if *statusFdOpt <= 0 {
return
}

const (
unixStdout = 1
unixStderr = 2
)

// Even though Windows uses different numbers, we always equate 1/2 with
// stdout/stderr because Git always passes `--status-fd=1`.
switch *statusFdOpt {
case unixStdout:
statusFile = os.Stdout
case unixStderr:
statusFile = os.Stderr
default:
// TODO: debugging output if this fails
statusFile = os.NewFile(uintptr(*statusFdOpt), "status")
}
})
}

func (s status) emitf(format string, args ...interface{}) {
setupStatus()

if statusFile == nil {
return
Expand All @@ -133,12 +153,7 @@ func (s status) emitf(format string, args ...interface{}) {
}

func (s status) emit() {
setupStatus.Do(func() {
if *statusFdOpt > 0 {
// TODO: debugging output if this fails
statusFile = os.NewFile(uintptr(*statusFdOpt), "status")
}
})
setupStatus()

if statusFile == nil {
return
Expand Down