diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-01-17 14:20:29 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-01-17 14:20:29 +0000 |
| commit | c6d6367f848cfd8381aba41e035c5e7e873667c5 (patch) | |
| tree | a218e98243463fc27f5053b4444e2544c63cd57a /libgo/go/os/file_unix.go | |
| parent | 9bff0086915f544fa648ea81131f035cb9ce79a4 (diff) | |
| download | gcc-c6d6367f848cfd8381aba41e035c5e7e873667c5.zip gcc-c6d6367f848cfd8381aba41e035c5e7e873667c5.tar.gz gcc-c6d6367f848cfd8381aba41e035c5e7e873667c5.tar.bz2 | |
libgo: update to Go1.10beta2 release
Reviewed-on: https://go-review.googlesource.com/87897
From-SVN: r256794
Diffstat (limited to 'libgo/go/os/file_unix.go')
| -rw-r--r-- | libgo/go/os/file_unix.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libgo/go/os/file_unix.go b/libgo/go/os/file_unix.go index af9c37f9..67d2ee1 100644 --- a/libgo/go/os/file_unix.go +++ b/libgo/go/os/file_unix.go @@ -66,7 +66,7 @@ func (f *File) Fd() uintptr { // opened in blocking mode. The File will continue to work, // but any blocking operation will tie up a thread. if f.nonblock { - syscall.SetNonblock(f.pfd.Sysfd, false) + f.pfd.SetBlocking() } return uintptr(f.pfd.Sysfd) @@ -152,12 +152,8 @@ func epipecheck(file *File, e error) { // On Unix-like systems, it is "/dev/null"; on Windows, "NUL". const DevNull = "/dev/null" -// OpenFile is the generalized open call; most users will use Open -// or Create instead. It opens the named file with specified flag -// (O_RDONLY etc.) and perm, (0666 etc.) if applicable. If successful, -// methods on the returned File can be used for I/O. -// If there is an error, it will be of type *PathError. -func OpenFile(name string, flag int, perm FileMode) (*File, error) { +// openFileNolog is the Unix implementation of OpenFile. +func openFileNolog(name string, flag int, perm FileMode) (*File, error) { chmod := false if !supportsCreateWithStickyBit && flag&O_CREATE != 0 && perm&ModeSticky != 0 { if _, err := Stat(name); IsNotExist(err) { |