archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'pull-request/1032'

Browse source 
* pull-request/1032:
  do_fstat changes
This commit is contained in:
Stanislav Malyshev 2015-02-01 00:56:27 -08:00
commit c752e1b786
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
main/streams/plain_wrapper.c
View file

@ -577,9 +577,10 @@ static int php_stdiop_stat(php_stream *stream, php_stream_statbuf *ssb)
php_stdio_stream_data *data = (php_stdio_stream_data*) stream->abstract;
assert(data != NULL);
if((ret = do_fstat(data, 1)) == 0) {
memcpy(&ssb->sb, &data->sb, sizeof(ssb->sb));
}
ret = do_fstat(data, 1);
memcpy(&ssb->sb, &data->sb, sizeof(ssb->sb));
return ret;
}
@ -669,7 +670,9 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void
return fd == -1 ? PHP_STREAM_OPTION_RETURN_ERR : PHP_STREAM_OPTION_RETURN_OK;
case PHP_STREAM_MMAP_MAP_RANGE:
do_fstat(data, 1);
if(do_fstat(data, 1) != 0) {
return PHP_STREAM_OPTION_RETURN_ERR;
}
if (range->length == 0 && range->offset > 0 && range->offset < data->sb.st_size) {
range->length = data->sb.st_size - range->offset;
}