[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/link.c trunk/TSRM/tsrm_virtual_cwd.c trunk/ext/standard/link.c

[Pierre Joye]

pajoye                                   Mon, 13 Sep 2010 09:30:07 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=303310

Log:
- use php_sys_readlink

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/standard/link.c
    U   php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
    U   php/php-src/trunk/ext/standard/link.c

Modified: php/php-src/branches/PHP_5_3/ext/standard/link.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/link.c    2010-09-13 09:08:42 UTC 
(rev 303309)
+++ php/php-src/branches/PHP_5_3/ext/standard/link.c    2010-09-13 09:30:07 UTC 
(rev 303310)
@@ -72,7 +72,7 @@
                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));

Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c   2010-09-13 09:08:42 UTC (rev 
303309)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c   2010-09-13 09:30:07 UTC (rev 
303310)
@@ -1006,7 +1006,7 @@
                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;

Modified: php/php-src/trunk/ext/standard/link.c
===================================================================
--- php/php-src/trunk/ext/standard/link.c       2010-09-13 09:08:42 UTC (rev 
303309)
+++ php/php-src/trunk/ext/standard/link.c       2010-09-13 09:30:07 UTC (rev 
303310)
@@ -67,7 +67,7 @@
                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));


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php