github/creack.pty
2
0
Fork 0
mirror of https://github.com/creack/pty.git synced 2026-03-31 02:27:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

gofix for release.r57.1

Browse Source
This commit is contained in:
Keith Rarick
2011-05-24 12:08:43 -07:00
parent e4a07d1891
commit 227762de52
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pty_darwin.go
View File

@@ -14,7 +14,7 @@ const (
// Opens a pty and its corresponding tty.
func Open() (pty, tty *os.File, err os.Error) {
p, err := os.Open("/dev/ptmx", os.O_RDWR, 0)
p, err := os.OpenFile("/dev/ptmx", os.O_RDWR, 0)
if err != nil {
return nil, nil, err
}
@@ -29,7 +29,7 @@ func Open() (pty, tty *os.File, err os.Error) {
return nil, nil, err
}
t, err := os.Open(sname, os.O_RDWR, 0)
t, err := os.OpenFile(sname, os.O_RDWR, 0)
if err != nil {
return nil, nil, err
}
@@ -49,13 +49,12 @@ func ptsname(f *os.File) (string, os.Error) {
return "/dev/tty" + string([]byte{
ptdev1[minor(fi.Rdev)/32],
ptdev2[minor(fi.Rdev)%32],
}), nil
}),nil
}
func grantpt(f *os.File) os.Error {
p, err := os.StartProcess("/bin/ptchown", []string{"/bin/ptchown"},
nil, "", []*os.File{f})
p, err := os.StartProcess("/bin/ptchown", []string{"/bin/ptchown"}, &os.ProcAttr{Files: []*os.File{f}})
if err != nil {
return err
}

4
pty_linux.go
View File

@@ -15,7 +15,7 @@ const (
// Opens a pty and its corresponding tty.
func Open() (pty, tty *os.File, err os.Error) {
p, err := os.Open("/dev/ptmx", os.O_RDWR, 0)
p, err := os.OpenFile("/dev/ptmx", os.O_RDWR, 0)
if err != nil {
return nil, nil, err
}
@@ -30,7 +30,7 @@ func Open() (pty, tty *os.File, err os.Error) {
return nil, nil, err
}
t, err := os.Open(sname, os.O_RDWR, 0)
t, err := os.OpenFile(sname, os.O_RDWR, 0)
if err != nil {
return nil, nil, err
}

2
run.go
View File

@@ -23,7 +23,7 @@ func Run(name string, argv, envv []string, dir string) (c *exec.Cmd, err os.Erro
fd[1] = fd[0]
fd[2] = fd[0]
c.Stdout = c.Stdin
c.Process, err = os.StartProcess(name, argv, envv, dir, fd[:])
c.Process, err = os.StartProcess(name, argv, &os.ProcAttr{Env: envv, Dir: dir, Files: fd[:]})
fd[0].Close()
if err != nil {
c.Stdin.Close()