RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

libcsupport: Accept NULL for zero-length entries

Browse Source
This commit is contained in:
Sebastian Huber
2013-12-17 10:59:13 +01:00
parent 56bea4339f
commit c1d8ee4cdc
4 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpukit/libcsupport/include/rtems/libio_.h
View File

@@ -887,7 +887,7 @@ static inline ssize_t rtems_libio_iovec_eval(
total += ( ssize_t ) len; total += ( ssize_t ) len;
if ( iov[ v ].iov_base == NULL ) { if ( iov[ v ].iov_base == NULL && len != 0 ) {
rtems_set_errno_and_return_minus_one( EINVAL ); rtems_set_errno_and_return_minus_one( EINVAL );
} }
} }

24
cpukit/libfs/src/defaults/default_readv.c
View File

@@ -41,19 +41,23 @@ ssize_t rtems_filesystem_default_readv(
total = 0; total = 0;
for ( v = 0 ; v < iovcnt ; ++v ) { for ( v = 0 ; v < iovcnt ; ++v ) {
ssize_t bytes = ( *iop->pathinfo.handlers->read_h )( size_t len = iov[ v ].iov_len;
iop,
iov[ v ].iov_base,
iov[ v ].iov_len
);
if ( bytes < 0 ) if ( len > 0 ) {
return -1; ssize_t bytes = ( *iop->pathinfo.handlers->read_h )(
iop,
iov[ v ].iov_base,
len
);
total += bytes; if ( bytes < 0 )
return -1;
if ( bytes != iov[ v ].iov_len ) total += bytes;
break;
if ( bytes != ( ssize_t ) len )
break;
}
} }
return total; return total;

24
cpukit/libfs/src/defaults/default_writev.c
View File

@@ -41,19 +41,23 @@ ssize_t rtems_filesystem_default_writev(
total = 0; total = 0;
for ( v = 0 ; v < iovcnt ; ++v ) { for ( v = 0 ; v < iovcnt ; ++v ) {
ssize_t bytes = ( *iop->pathinfo.handlers->write_h )( size_t len = iov[ v ].iov_len;
iop,
iov[ v ].iov_base,
iov[ v ].iov_len
);
if ( bytes < 0 ) if ( len > 0 ) {
return -1; ssize_t bytes = ( *iop->pathinfo.handlers->write_h )(
iop,
iov[ v ].iov_base,
len
);
total += bytes; if ( bytes < 0 )
return -1;
if ( bytes != iov[ v ].iov_len ) total += bytes;
break;
if ( bytes != ( ssize_t ) len )
break;
}
} }
return total; return total;

4
testsuites/psxtests/psxrdwrv/test.c
View File

@@ -361,7 +361,7 @@ int doErrorTest(void)
/* writev -- all zero length buffers */ /* writev -- all zero length buffers */
vec[0].iov_base = vec; vec[0].iov_base = vec;
vec[0].iov_len = 0; vec[0].iov_len = 0;
vec[1].iov_base = vec; vec[1].iov_base = NULL;
vec[1].iov_len = 0; vec[1].iov_len = 0;
puts("writev iov_len works with no effect -- OK"); puts("writev iov_len works with no effect -- OK");
rc = writev(fd, vec, 2); rc = writev(fd, vec, 2);
@@ -374,7 +374,7 @@ int doErrorTest(void)
/* readv -- all zero length buffers */ /* readv -- all zero length buffers */
vec[0].iov_base = vec; vec[0].iov_base = vec;
vec[0].iov_len = 0; vec[0].iov_len = 0;
vec[1].iov_base = vec; vec[1].iov_base = NULL;
vec[1].iov_len = 0; vec[1].iov_len = 0;
puts("readv iov_len works with no effect -- OK"); puts("readv iov_len works with no effect -- OK");
rc = readv(fd, vec, 2); rc = readv(fd, vec, 2);