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/fpathconf.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/fpathconf.c')
-rw-r--r-- | c/src/lib/libc/fpathconf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/c/src/lib/libc/fpathconf.c b/c/src/lib/libc/fpathconf.c index ea2377e15b..f3fb1162d0 100644 --- a/c/src/lib/libc/fpathconf.c +++ b/c/src/lib/libc/fpathconf.c @@ -26,23 +26,23 @@ long fpathconf( rtems_libio_t *iop; rtems_filesystem_limits_and_options_t *the_limits; + rtems_libio_check_fd(fd); + iop = rtems_libio_iop(fd); + rtems_libio_check_permissions(iop, LIBIO_FLAGS_READ); + /* * If this file descriptor is mapped to an external set of handlers, * then it is an error since fpathconf() is not included in the * set. */ - if ( rtems_file_descriptor_type( fd ) ) + if ( iop->flags & LIBIO_FLAGS_HANDLER_MASK ) set_errno_and_return_minus_one( EBADF ); /* * Now process the information request. */ - iop = rtems_libio_iop(fd); - rtems_libio_check_fd(fd); - rtems_libio_check_permissions(iop, LIBIO_FLAGS_READ); - the_limits = &iop->pathinfo.mt_entry->pathconf_limits_and_options; switch ( name ) { |