clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

@- fgets($fp) (with no length parameter) now uses a buffer as long as the

Browse Source 
@  the next line available from the $fp. Previously, there was a 1KB limit.
@  (Wez)
This commit is contained in:
Wez Furlong 2002-10-14 02:28:35 +00:00
parent 39f8d4c971
commit 86e60a2d7a
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ext/standard/file.c
View File

@ -1247,8 +1247,8 @@ PHP_FUNCTION(stream_set_timeout)
PHPAPI PHP_FUNCTION(fgets)
{
zval **arg1, **arg2;
int len = 1024;
char *buf;
int len;
char *buf = NULL;
int argc = ZEND_NUM_ARGS();
php_stream *stream;
@ -1258,30 +1258,33 @@ PHPAPI PHP_FUNCTION(fgets)
php_stream_from_zval(stream, arg1);
if (argc>1) {
if (argc == 1) {
/* ask streams to give us a buffer of an appropriate size */
buf = php_stream_gets(stream, NULL, 0);
if (buf == NULL)
goto exit_failed;
} else if (argc > 1) {
convert_to_long_ex(arg2);
len = Z_LVAL_PP(arg2);
if (len < 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter may not be negative");
RETURN_FALSE;
}
buf = ecalloc(len + 1, sizeof(char));
if (php_stream_gets(stream, buf, len) == NULL)
goto exit_failed;
}
if (len < 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter may not be negative");
RETURN_FALSE;
}
buf = emalloc(sizeof(char) * (len + 1));
/* needed because recv doesnt put a null at the end*/
memset(buf, 0, len+1);
if (php_stream_gets(stream, buf, len) == NULL)
goto exit_failed;
if (PG(magic_quotes_runtime)) {
Z_STRVAL_P(return_value) = php_addslashes(buf, 0, &Z_STRLEN_P(return_value), 1 TSRMLS_CC);
Z_TYPE_P(return_value) = IS_STRING;
} else {
ZVAL_STRING(return_value, buf, 0);
/* resize buffer if it's much larger than the result */
if (Z_STRLEN_P(return_value) < len / 2) {
/* resize buffer if it's much larger than the result.
* Only needed if the user requested a buffer size. */
if (argc > 1 && Z_STRLEN_P(return_value) < len / 2) {
Z_STRVAL_P(return_value) = erealloc(buf, Z_STRLEN_P(return_value) + 1);
}
}
@ -1289,7 +1292,8 @@ PHPAPI PHP_FUNCTION(fgets)
exit_failed:
RETVAL_FALSE;
efree(buf);
if (buf)
efree(buf);
}
/* }}} */

10
main/streams.c
View File

@ -666,8 +666,8 @@ static char *php_stream_locate_eol(php_stream *stream TSRMLS_DC)
PHPAPI char *_php_stream_gets(php_stream *stream, char *buf, size_t maxlen TSRMLS_DC)
{
size_t avail = 0;
int did_copy = 0;
size_t current_buf_size = 0;
size_t total_copied = 0;
int grow_mode = 0;
char *bufstart = buf;
@ -718,6 +718,7 @@ PHPAPI char *_php_stream_gets(php_stream *stream, char *buf, size_t maxlen TSRML
* hard to follow */
bufstart = erealloc(bufstart, current_buf_size + cpysz + 1);
current_buf_size += cpysz + 1;
buf = bufstart + total_copied;
} else {
if (cpysz >= maxlen - 1) {
cpysz = maxlen - 1;
@ -731,8 +732,8 @@ PHPAPI char *_php_stream_gets(php_stream *stream, char *buf, size_t maxlen TSRML
stream->readpos += cpysz;
buf += cpysz;
maxlen -= cpysz;
total_copied += cpysz;
did_copy = 1;
if (done) {
break;
}
@ -758,8 +759,11 @@ PHPAPI char *_php_stream_gets(php_stream *stream, char *buf, size_t maxlen TSRML
}
}
if (!did_copy)
if (total_copied == 0) {
if (grow_mode)
assert(bufstart != NULL);
return NULL;
}
buf[0] = '\0';