mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-25 21:23:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

We shoud not fseek in a pipe and this caused a problem with popen and

Browse Source 
fgets on the platforms where the buffer fix was applied (Solaris, FreeBSD).
Now the fseek is done only when the handle is of type fopen.
This commit is contained in:
Alexander Feldman 2001-04-15 18:42:50 +00:00
parent 6426150e20
commit 531b8042ad
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/standard/file.c
View File

@ -921,7 +921,7 @@ PHP_FUNCTION(fgets)
/* needed because recv doesnt put a null at the end*/
memset(buf,0,len+1);
#ifdef HAVE_FLUSHIO
if (!issock) {
if (type == le_fopen) {
fseek((FILE*)what, 0, SEEK_CUR);
}
#endif
@ -969,7 +969,7 @@ PHP_FUNCTION(fgetc) {
}
#ifdef HAVE_FLUSHIO
if (!issock) {
if (type == le_fopen) {
fseek((FILE*)what, 0, SEEK_CUR);
}
#endif
@ -1172,7 +1172,9 @@ PHP_FUNCTION(fwrite)
ret = SOCK_WRITEL((*arg2)->value.str.val,num_bytes,socketd);
} else {
#ifdef HAVE_FLUSHIO
fseek((FILE*)what, 0, SEEK_CUR);
if (type == le_fopen) {
fseek((FILE*)what, 0, SEEK_CUR);
}
#endif
ret = fwrite((*arg2)->value.str.val,1,num_bytes,(FILE*)what);
}
@ -1814,7 +1816,9 @@ PHP_FUNCTION(fread)
if (!issock) {
#ifdef HAVE_FLUSHIO
fseek((FILE*)what, 0, SEEK_CUR);
if (type == le_fopen)
fseek((FILE*)what, 0, SEEK_CUR);
}
#endif
return_value->value.str.len = fread(return_value->value.str.val, 1, len, (FILE*)what);
return_value->value.str.val[return_value->value.str.len] = 0;