From 877153f04aef18d25757ad3bf4b097460c7c4699 Mon Sep 17 00:00:00 2001 From: Alan Donovan Date: Wed, 27 Feb 2013 17:00:02 -0500 Subject: [PATCH] exp/ssa: fix *bsd breakage. Use portable ReadDirent, not linux Getdents. R=gri TBR=gri CC=golang-dev https://golang.org/cl/7405051 --- src/pkg/exp/ssa/interp/external.go | 2 +- src/pkg/exp/ssa/interp/external_plan9.go | 6 +++--- src/pkg/exp/ssa/interp/external_unix.go | 6 +++--- src/pkg/exp/ssa/interp/external_windows.go | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pkg/exp/ssa/interp/external.go b/src/pkg/exp/ssa/interp/external.go index 25b012eed3..e1e89d2475 100644 --- a/src/pkg/exp/ssa/interp/external.go +++ b/src/pkg/exp/ssa/interp/external.go @@ -70,7 +70,6 @@ var externals = map[string]externalFn{ "syscall.Close": extÛ°syscallÛ°Close, "syscall.Exit": extÛ°syscallÛ°Exit, "syscall.Fstat": extÛ°syscallÛ°Fstat, - "syscall.Getdents": extÛ°syscallÛ°Getdents, "syscall.Getpid": extÛ°syscallÛ°Getpid, "syscall.Getwd": extÛ°syscallÛ°Getwd, "syscall.Kill": extÛ°syscallÛ°Kill, @@ -78,6 +77,7 @@ var externals = map[string]externalFn{ "syscall.Open": extÛ°syscallÛ°Open, "syscall.ParseDirent": extÛ°syscallÛ°ParseDirent, "syscall.Read": extÛ°syscallÛ°Read, + "syscall.ReadDirent": extÛ°syscallÛ°ReadDirent, "syscall.Stat": extÛ°syscallÛ°Stat, "syscall.Write": extÛ°syscallÛ°Write, "time.Sleep": extÛ°timeÛ°Sleep, diff --git a/src/pkg/exp/ssa/interp/external_plan9.go b/src/pkg/exp/ssa/interp/external_plan9.go index ce7fd529b1..f7d2a4b300 100644 --- a/src/pkg/exp/ssa/interp/external_plan9.go +++ b/src/pkg/exp/ssa/interp/external_plan9.go @@ -15,9 +15,6 @@ func extÛ°syscallÛ°Close(fn *ssa.Function, args []value) value { func extÛ°syscallÛ°Fstat(fn *ssa.Function, args []value) value { panic("syscall.Fstat not yet implemented") } -func extÛ°syscallÛ°Getdents(fn *ssa.Function, args []value) value { - panic("syscall.Getdents not yet implemented") -} func extÛ°syscallÛ°Kill(fn *ssa.Function, args []value) value { panic("syscall.Kill not yet implemented") } @@ -33,6 +30,9 @@ func extÛ°syscallÛ°ParseDirent(fn *ssa.Function, args []value) value { func extÛ°syscallÛ°Read(fn *ssa.Function, args []value) value { panic("syscall.Read not yet implemented") } +func extÛ°syscallÛ°ReadDirent(fn *ssa.Function, args []value) value { + panic("syscall.ReadDirent not yet implemented") +} func extÛ°syscallÛ°Stat(fn *ssa.Function, args []value) value { panic("syscall.Stat not yet implemented") } diff --git a/src/pkg/exp/ssa/interp/external_unix.go b/src/pkg/exp/ssa/interp/external_unix.go index c81454ae26..d6875cb88b 100644 --- a/src/pkg/exp/ssa/interp/external_unix.go +++ b/src/pkg/exp/ssa/interp/external_unix.go @@ -54,12 +54,12 @@ func extÛ°syscallÛ°Fstat(fn *ssa.Function, args []value) value { return wrapError(err) } -func extÛ°syscallÛ°Getdents(fn *ssa.Function, args []value) value { - // func GetDents(fd int, buf []byte) (n int, err error) +func extÛ°syscallÛ°ReadDirent(fn *ssa.Function, args []value) value { + // func ReadDirent(fd int, buf []byte) (n int, err error) fd := args[0].(int) p := args[1].([]value) b := make([]byte, len(p)) - n, err := syscall.Getdents(fd, b) + n, err := syscall.ReadDirent(fd, b) for i := 0; i < n; i++ { p[i] = b[i] } diff --git a/src/pkg/exp/ssa/interp/external_windows.go b/src/pkg/exp/ssa/interp/external_windows.go index 9b782ea1a6..86137d4b3d 100644 --- a/src/pkg/exp/ssa/interp/external_windows.go +++ b/src/pkg/exp/ssa/interp/external_windows.go @@ -16,9 +16,6 @@ func extÛ°syscallÛ°Close(fn *ssa.Function, args []value) value { func extÛ°syscallÛ°Fstat(fn *ssa.Function, args []value) value { panic("syscall.Fstat not yet implemented") } -func extÛ°syscallÛ°Getdents(fn *ssa.Function, args []value) value { - panic("syscall.Getdents not yet implemented") -} func extÛ°syscallÛ°Kill(fn *ssa.Function, args []value) value { panic("syscall.Kill not yet implemented") } @@ -34,6 +31,9 @@ func extÛ°syscallÛ°ParseDirent(fn *ssa.Function, args []value) value { func extÛ°syscallÛ°Read(fn *ssa.Function, args []value) value { panic("syscall.Read not yet implemented") } +func extÛ°syscallÛ°ReadDirent(fn *ssa.Function, args []value) value { + panic("syscall.ReadDirent not yet implemented") +} func extÛ°syscallÛ°Stat(fn *ssa.Function, args []value) value { panic("syscall.Stat not yet implemented") } -- 2.48.1