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

int/long change.

Browse Source
This commit is contained in:
Ilia Alshanetsky 2003-02-22 20:33:11 +00:00
parent fef5b7c3a1
commit d2e2fbcc5b
4 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/standard/basic_functions.c
View File

@ -670,6 +670,7 @@ function_entry basic_functions[] = {
PHP_STATIC_FE("tmpfile", php_if_tmpfile, NULL)
PHP_FE(file, NULL)
PHP_FE(file_get_contents, NULL)
PHP_FE(file_write_content, NULL)
PHP_FE(stream_select, first_through_third_args_force_ref)
PHP_FE(stream_context_create, NULL)
PHP_FE(stream_context_set_params, NULL)

61
ext/standard/file.c
View File

@ -408,6 +408,67 @@ PHP_FUNCTION(get_meta_tags)
/* }}} */
/* {{{ proto int file_write_content(string filename, mixed content [, char mode [, bool use_include_path]])
Write a string to a file. */
PHP_FUNCTION(file_write_content)
{
zval *content;
char *filename, *mode;
int filename_len, mode_len = 0;
zend_bool use_include_path = 0;
size_t written;
php_stream *stream;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|sb", &filename, &filename_len, &content, &mode, &mode_len, &use_include_path) == FAILURE) {
RETURN_FALSE;
}
if (!(stream = php_stream_open_wrapper(filename, (mode_len ? mode : "wb"), (use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL))) {
RETURN_FALSE;
}
/* try to set an exclusive lock on the file to prevent access to the file while the write operation
* is happening.
*/
php_stream_set_option(stream, PHP_STREAM_OPTION_LOCKING, F_SETLKW, (void *) F_WRLCK TSRMLS_CC);
if (Z_TYPE_P(content) == IS_ARRAY) {
HashPosition pos;
zval **tmp;
size_t cur_write;
written = 0;
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(content), &pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(content), (void **) &tmp, &pos) == SUCCESS) {
SEPARATE_ZVAL(tmp);
convert_to_string(*tmp);
if ((cur_write = php_stream_write(stream, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp))) < 0) {
RETVAL_FALSE;
goto done;
}
written += cur_write;
zend_hash_move_forward_ex(Z_ARRVAL_P(content), &pos);
}
RETVAL_LONG(written);
} else {
SEPARATE_ZVAL(&content);
convert_to_string(content);
if ((written = php_stream_write(stream, Z_STRVAL_P(content), Z_STRLEN_P(content))) < 0) {
RETVAL_FALSE;
} else {
RETVAL_LONG(written);
}
zval_ptr_dtor(&content);
}
done:
php_stream_close(stream);
}
/* }}} */
/* {{{ proto string file_get_contents(string filename [, bool use_include_path])
Read the entire file into a string */
PHP_FUNCTION(file_get_contents)

1
ext/standard/file.h
View File

@ -54,6 +54,7 @@ PHP_FUNCTION(unlink);
PHP_FUNCTION(copy);
PHP_FUNCTION(file);
PHP_FUNCTION(file_get_contents);
PHP_FUNCTION(file_write_content);
PHP_FUNCTION(set_socket_blocking); /* deprecated */
PHP_FUNCTION(stream_set_blocking);
PHP_FUNCTION(stream_select);

6
ext/standard/html.c
View File

@ -831,11 +831,11 @@ static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all)
{
char *str, *hint_charset = NULL;
int str_len, hint_charset_len = 0;
int len, quote_style = ENT_COMPAT;
int len;
long quote_style = ENT_COMPAT;
char *replaced;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls", &str, &str_len,
&quote_style, &hint_charset, &hint_charset_len) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls", &str, &str_len, &quote_style, &hint_charset, &hint_charset_len) == FAILURE) {
return;
}