cvs: php-src(PHP_5_2) /ext/standard/tests/file stream_rfc2397_007.phpt /main/streams memory.c

From: Date: Tue, 23 May 2006 22:31:25 +0000
Subject: cvs: php-src(PHP_5_2) /ext/standard/tests/file stream_rfc2397_007.phpt /main/streams memory.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-38377@lists.php.net to get a copy of this message
helly Tue May 23 22:31:25 2006 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/file stream_rfc2397_007.phpt Modified files: /php-src/main/streams memory.c Log: - MFH Fix feof() http://cvs.php.net/viewcvs.cgi/php-src/main/streams/memory.c?r1=1.8.2.6.2.5&r2=1.8.2.6.2.6&diff_format=u Index: php-src/main/streams/memory.c diff -u php-src/main/streams/memory.c:1.8.2.6.2.5 php-src/main/streams/memory.c:1.8.2.6.2.6 --- php-src/main/streams/memory.c:1.8.2.6.2.5 Sun May 21 13:37:19 2006 +++ php-src/main/streams/memory.c Tue May 23 22:31:25 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: memory.c,v 1.8.2.6.2.5 2006/05/21 13:37:19 helly Exp $ */ +/* $Id: memory.c,v 1.8.2.6.2.6 2006/05/23 22:31:25 helly Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -88,16 +88,15 @@ php_stream_memory_data *ms = (php_stream_memory_data*)stream->abstract; assert(ms != NULL); - if (ms->fpos + count > ms->fsize) { + if (ms->fpos + count >= ms->fsize) { count = ms->fsize - ms->fpos; + stream->eof = 1; } if (count) { assert(ms->data!= NULL); assert(buf!= NULL); memcpy(buf, ms->data+ms->fpos, count); ms->fpos += count; - } else { - stream->eof = 1; } return count; } @@ -147,6 +146,7 @@ } else { ms->fpos = ms->fpos + offset; *newoffs = ms->fpos; + stream->eof = 0; return 0; } } else { @@ -157,6 +157,7 @@ } else { ms->fpos = ms->fpos + offset; *newoffs = ms->fpos; + stream->eof = 0; return 0; } } @@ -168,6 +169,7 @@ } else { ms->fpos = offset; *newoffs = ms->fpos; + stream->eof = 0; return 0; } case SEEK_END: @@ -182,6 +184,7 @@ } else { ms->fpos = ms->fsize + offset; *newoffs = ms->fpos; + stream->eof = 0; return 0; } default: @@ -359,9 +362,7 @@ got = php_stream_read(ts->innerstream, buf, count); - if (!got) { - stream->eof |= ts->innerstream->eof; - } + stream->eof = ts->innerstream->eof; return got; } @@ -418,6 +419,7 @@ } ret = php_stream_seek(ts->innerstream, offset, whence); *newoffs = php_stream_tell(ts->innerstream); + stream->eof = ts->innerstream->eof; return ret; } http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/stream_rfc2397_007.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/stream_rfc2397_007.phpt +++ php-src/ext/standard/tests/file/stream_rfc2397_007.phpt --TEST-- Stream: RFC2397 and seeking --FILE-- <?php $streams = array( "data:,012345", ); foreach($streams as $stream) { echo "===$stream===\n"; $fp = fopen($stream, 'rb'); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:4,S===\n"; var_dump(fseek($fp, 4)); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===GETC===\n"; var_dump(fgetc($fp)); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===GETC===\n"; var_dump(fgetc($fp)); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===REWIND===\n"; var_dump(rewind($fp)); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===GETC===\n"; var_dump(fgetc($fp)); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:3,S===\n"; var_dump(fseek($fp, 3, SEEK_SET)); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:1,C===\n"; var_dump(fseek($fp, 1, SEEK_CUR)); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:-2,C===\n"; var_dump(fseek($fp, -2, SEEK_CUR)); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:-10,C===\n"; var_dump(fseek($fp, -10, SEEK_CUR)); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:3,S===\n"; var_dump(fseek($fp, 3, SEEK_SET)); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:10,C===\n"; var_dump(fseek($fp, 10, SEEK_CUR)); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:-1,E===\n"; var_dump(fseek($fp, -1, SEEK_END)); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:0,E===\n"; var_dump(fseek($fp, 0, SEEK_END)); var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:1,E===\n"; var_dump(fseek($fp, 1, SEEK_END)); var_dump(ftell($fp)); var_dump(feof($fp)); fclose($fp); } ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- ===data:,012345=== int(0) bool(false) ===S:4,S=== int(0) int(4) bool(false) ===GETC=== string(1) "4" int(5) bool(false) ===GETC=== string(1) "5" int(6) bool(true) ===REWIND=== bool(true) int(0) bool(false) ===GETC=== string(1) "0" int(1) bool(false) ===S:3,S=== int(0) int(3) bool(false) ===S:1,C=== int(0) int(4) bool(false) ===S:-2,C=== int(0) int(2) bool(false) ===S:-10,C=== int(-1) bool(false) bool(false) ===S:3,S=== int(0) int(3) bool(false) ===S:10,C=== int(-1) bool(false) bool(false) ===S:-1,E=== int(0) int(5) bool(false) ===S:0,E=== int(0) int(6) bool(false) ===S:1,E=== int(-1) bool(false) bool(false) ===DONE===

« previous php.cvs (#38377) next »