From cca44008d81209e9fa992157637d9de0384e0536 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 10 Dec 1998 23:31:54 +0000 Subject: Merged Eric Norum's select patch that was based on 4.0 and resolved all conflicts. --- cpukit/libcsupport/src/ftruncate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cpukit/libcsupport/src/ftruncate.c') diff --git a/cpukit/libcsupport/src/ftruncate.c b/cpukit/libcsupport/src/ftruncate.c index 7fb2286531..5bcb2ea5d8 100644 --- a/cpukit/libcsupport/src/ftruncate.c +++ b/cpukit/libcsupport/src/ftruncate.c @@ -25,19 +25,20 @@ int ftruncate( rtems_libio_t *iop; rtems_filesystem_location_info_t loc; + rtems_libio_check_fd( fd ); + iop = rtems_libio_iop( fd ); + /* * If this is not a file system based entity, it is an error. */ - if ( rtems_file_descriptor_type( fd ) ) + if ( iop->flags & LIBIO_FLAGS_HANDLER_MASK ) set_errno_and_return_minus_one( EBADF ); /* * Now process the ftruncate() request. */ - iop = rtems_libio_iop( fd ); - /* * Make sure we are not working on a directory */ @@ -49,7 +50,6 @@ int ftruncate( if ( (*loc.ops->node_type)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY ) set_errno_and_return_minus_one( EISDIR ); - rtems_libio_check_fd( fd ); rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE ); if ( !iop->handlers->ftruncate ) -- cgit v1.2.3