diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-12-10 23:31:54 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-12-10 23:31:54 +0000 |
commit | cca44008d81209e9fa992157637d9de0384e0536 (patch) | |
tree | e13728c80e91a8cff28f98ca7d7e6dea2359e05f /c/src/lib/libc/close.c | |
parent | RDBG headers files ignored if not configured (diff) | |
download | rtems-cca44008d81209e9fa992157637d9de0384e0536.tar.bz2 |
Merged Eric Norum's select patch that was based on 4.0 and resolved
all conflicts.
Diffstat (limited to 'c/src/lib/libc/close.c')
-rw-r--r-- | c/src/lib/libc/close.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/c/src/lib/libc/close.c b/c/src/lib/libc/close.c index 94ddb45c90..0583a36b22 100644 --- a/c/src/lib/libc/close.c +++ b/c/src/lib/libc/close.c @@ -22,17 +22,18 @@ int close( rtems_status_code rc; int status; - if ( rtems_file_descriptor_type( fd ) ) { + rtems_libio_check_fd(fd); + iop = rtems_libio_iop(fd); + if ( iop->flags & LIBIO_FLAGS_HANDLER_MASK ) { int (*fp)(int fd); - fp = rtems_libio_handlers[rtems_file_descriptor_type_index(fd)].close; + fp = rtems_libio_handlers[ + (iop->flags >> LIBIO_FLAGS_HANDLER_SHIFT) - 1].close; if ( fp == NULL ) set_errno_and_return_minus_one( EBADF ); status = (*fp)( fd ); return status; } - iop = rtems_libio_iop(fd); - rtems_libio_check_fd(fd); if ( !iop->handlers ) set_errno_and_return_minus_one( EBADF ); |