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

Unicode support for link functions.

Browse source
This commit is contained in:
Andrei Zmievski 2006-10-26 20:25:45 +00:00
parent 8f54e61aa5
commit 01ac3f00f8
1 changed files with 50 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

81
ext/standard/link.c
View file

@ -48,25 +48,29 @@
#include <ctype.h> #include <ctype.h>
#include "php_link.h" #include "php_link.h"
#include "ext/standard/file.h"
/* {{{ proto string readlink(string filename) /* {{{ proto string readlink(string filename) U
Return the target of a symbolic link */ Return the target of a symbolic link */
PHP_FUNCTION(readlink) PHP_FUNCTION(readlink)
{ {
zval **filename; zval **pp_link;
char *link;
UChar *target;
int link_len, target_len;
char buff[MAXPATHLEN]; char buff[MAXPATHLEN];
int ret; int ret;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &pp_link) == FAILURE ||
WRONG_PARAM_COUNT; php_stream_path_param_encode(pp_link, &link, &link_len, REPORT_ERRORS, FG(default_context)) == FAILURE) {
return;
} }
convert_to_string_ex(filename);
if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC)) { if (php_check_open_basedir(link TSRMLS_CC)) {
RETURN_FALSE; RETURN_FALSE;
} }
ret = readlink(Z_STRVAL_PP(filename), buff, MAXPATHLEN-1); ret = readlink(link, buff, MAXPATHLEN-1);
if (ret == -1) { if (ret == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno)); php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
@ -75,24 +79,34 @@ PHP_FUNCTION(readlink)
/* Append NULL to the end of the string */ /* Append NULL to the end of the string */
buff[ret] = '\0'; buff[ret] = '\0';
RETURN_RT_STRING(buff, 1); if (UG(unicode)) {
if (SUCCESS == php_stream_path_decode(NULL, &target, &target_len, buff, strlen(buff), REPORT_ERRORS, FG(default_context))) {
RETURN_UNICODEL(target, target_len, 0);
} else {
RETURN_FALSE;
}
} else {
RETURN_STRING(buff, 1);
}
} }
/* }}} */ /* }}} */
/* {{{ proto int linkinfo(string filename) /* {{{ proto int linkinfo(string filename) U
Returns the st_dev field of the UNIX C stat structure describing the link */ Returns the st_dev field of the UNIX C stat structure describing the link */
PHP_FUNCTION(linkinfo) PHP_FUNCTION(linkinfo)
{ {
zval **filename; zval **pp_link;
char *link;
int link_len;
struct stat sb; struct stat sb;
int ret; int ret;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &pp_link) == FAILURE ||
WRONG_PARAM_COUNT; php_stream_path_param_encode(pp_link, &link, &link_len, REPORT_ERRORS, FG(default_context)) == FAILURE) {
return;
} }
convert_to_string_ex(filename);
ret = VCWD_LSTAT(Z_STRVAL_PP(filename), &sb); ret = VCWD_LSTAT(link, &sb);
if (ret == -1) { if (ret == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno)); php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
RETURN_LONG(-1L); RETURN_LONG(-1L);
@ -102,22 +116,25 @@ PHP_FUNCTION(linkinfo)
} }
/* }}} */ /* }}} */
/* {{{ proto int symlink(string target, string link) /* {{{ proto int symlink(string target, string link) U
Create a symbolic link */ Create a symbolic link */
PHP_FUNCTION(symlink) PHP_FUNCTION(symlink)
{ {
zval **topath, **frompath; zval **pp_topath, **pp_frompath;
char *topath, *frompath;
int topath_len, frompath_len;
int ret; int ret;
char source_p[MAXPATHLEN]; char source_p[MAXPATHLEN];
char dest_p[MAXPATHLEN]; char dest_p[MAXPATHLEN];
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &topath, &frompath) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(topath);
convert_to_string_ex(frompath);
if (!expand_filepath(Z_STRVAL_PP(frompath), source_p TSRMLS_CC) || !expand_filepath(Z_STRVAL_PP(topath), dest_p TSRMLS_CC)) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZ", &pp_topath, &pp_frompath) == FAILURE ||
php_stream_path_param_encode(pp_topath, &topath, &topath_len, REPORT_ERRORS, FG(default_context)) == FAILURE ||
php_stream_path_param_encode(pp_frompath, &frompath, &frompath_len, REPORT_ERRORS, FG(default_context)) == FAILURE) {
return;
}
if (!expand_filepath(frompath, source_p TSRMLS_CC) || !expand_filepath(topath, dest_p TSRMLS_CC)) {
RETURN_FALSE; RETURN_FALSE;
} }
@ -137,7 +154,7 @@ PHP_FUNCTION(symlink)
} }
#ifndef ZTS #ifndef ZTS
ret = symlink(Z_STRVAL_PP(topath), Z_STRVAL_PP(frompath)); ret = symlink(topath, frompath);
#else #else
ret = symlink(dest_p, source_p); ret = symlink(dest_p, source_p);
#endif #endif
@ -150,22 +167,24 @@ PHP_FUNCTION(symlink)
} }
/* }}} */ /* }}} */
/* {{{ proto int link(string target, string link) /* {{{ proto int link(string target, string link) U
Create a hard link */ Create a hard link */
PHP_FUNCTION(link) PHP_FUNCTION(link)
{ {
zval **topath, **frompath; zval **pp_topath, **pp_frompath;
char *topath, *frompath;
int topath_len, frompath_len;
int ret; int ret;
char source_p[MAXPATHLEN]; char source_p[MAXPATHLEN];
char dest_p[MAXPATHLEN]; char dest_p[MAXPATHLEN];
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &topath, &frompath) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZ", &pp_topath, &pp_frompath) == FAILURE ||
WRONG_PARAM_COUNT; php_stream_path_param_encode(pp_topath, &topath, &topath_len, REPORT_ERRORS, FG(default_context)) == FAILURE ||
php_stream_path_param_encode(pp_frompath, &frompath, &frompath_len, REPORT_ERRORS, FG(default_context)) == FAILURE) {
return;
} }
convert_to_string_ex(topath);
convert_to_string_ex(frompath);
if (!expand_filepath(Z_STRVAL_PP(frompath), source_p TSRMLS_CC) || !expand_filepath(Z_STRVAL_PP(topath), dest_p TSRMLS_CC)) { if (!expand_filepath(frompath, source_p TSRMLS_CC) || !expand_filepath(topath, dest_p TSRMLS_CC)) {
RETURN_FALSE; RETURN_FALSE;
} }
@ -185,7 +204,7 @@ PHP_FUNCTION(link)
} }
#ifndef ZTS #ifndef ZTS
ret = link(Z_STRVAL_PP(topath), Z_STRVAL_PP(frompath)); ret = link(topath, frompath);
#else #else
ret = link(dest_p, source_p); ret = link(dest_p, source_p);
#endif #endif