From: Pierre Joye Date: Mon, 13 Sep 2010 09:30:07 +0000 (+0000) Subject: - use php_sys_readlink X-Git-Tag: php-5.4.0alpha1~191^2~965 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5ca12b03ec192e2a9155c8b5c50da375f9058cf;p=php - use php_sys_readlink --- diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index a6bdc8d393..dd882e6236 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -1006,7 +1006,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i memcpy(tmp, path, len+1); if (save && S_ISLNK(st.st_mode)) { - if (++(*ll) > LINK_MAX || (j = readlink(tmp, path, MAXPATHLEN)) < 0) { + if (++(*ll) > LINK_MAX || (j = php_sys_readlink(tmp, path, MAXPATHLEN)) < 0) { /* too many links or broken symlinks */ tsrm_free_alloca(tmp, use_heap); return -1; diff --git a/ext/standard/link.c b/ext/standard/link.c index 7029a20d02..65e7d2fe06 100644 --- a/ext/standard/link.c +++ b/ext/standard/link.c @@ -67,7 +67,7 @@ PHP_FUNCTION(readlink) RETURN_FALSE; } - ret = readlink(link, buff, MAXPATHLEN-1); + ret = php_sys_readlink(link, buff, MAXPATHLEN-1); if (ret == -1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));