Skip to content
Merged
Changes from all commits
Commits
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
19 changes: 9 additions & 10 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,20 @@ func client(addr string, args []string) int {
defer errw.Close()
cmd.Stderr = errw

var environ []string
err = dec.Decode(&environ)
if err != nil {
enc.Encode(&msg{Name: "error", Error: fmt.Sprintf("cannot execute command: %v", makeCmdLine(args))})
return 1
}
cmd.Env = environ

go func() {
defer inw.Close()
in_loop:
for {
var m msg
err = dec.Decode(&m)
if err != nil {
if err := dec.Decode(&m); err != nil {
return
}
switch m.Name {
Expand All @@ -69,14 +76,6 @@ func client(addr string, args []string) int {
}
}()

var environ []string
err = dec.Decode(&environ)
if err != nil {
enc.Encode(&msg{Name: "error", Error: fmt.Sprintf("cannot execute command: %v", makeCmdLine(args))})
return 1
}
cmd.Env = environ

err = cmd.Run()

code := 1
Expand Down
Loading