summaryrefslogtreecommitdiff
path: root/libgo/go
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2011-01-28 00:01:08 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2011-01-28 00:01:08 +0000
commita20d79f7d50b067cdac522211e59c704dfdefa9e (patch)
treef4236633c9d7e06df075266f39a9ff7f6c28a1cd /libgo/go
parente39e9de5ea5b9aae014644fdf268e2667235807e (diff)
downloadgcc-a20d79f7d50b067cdac522211e59c704dfdefa9e.tar.gz
When closing a file, call closedir if we called opendir.
Fixes Go issue 1448. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169344 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go')
-rw-r--r--libgo/go/os/file_unix.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/libgo/go/os/file_unix.go b/libgo/go/os/file_unix.go
index aa322c96383..57d4a477fc6 100644
--- a/libgo/go/os/file_unix.go
+++ b/libgo/go/os/file_unix.go
@@ -47,6 +47,13 @@ func (file *File) Close() Error {
if e := syscall.Close(file.fd); e != 0 {
err = &PathError{"close", file.name, Errno(e)}
}
+
+ if file.dirinfo != nil {
+ if libc_closedir(file.dirinfo.dir) < 0 && err == nil {
+ err = &PathError{"closedir", file.name, Errno(syscall.GetErrno())}
+ }
+ }
+
file.fd = -1 // so it can't be closed again
// no need for a finalizer anymore