tony2001 Tue Jun 5 12:02:38 2007 UTC
Modified files:
/php-src/ext/spl spl_directory.c
Log:
no readlink() on windows
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.132&r2=1.133&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.132
php-src/ext/spl/spl_directory.c:1.133
--- php-src/ext/spl/spl_directory.c:1.132 Sun Mar 4 12:13:20 2007
+++ php-src/ext/spl/spl_directory.c Tue Jun 5 12:02:38 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.132 2007/03/04 12:13:20 helly Exp $ */
+/* $Id: spl_directory.c,v 1.133 2007/06/05 12:02:38 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -981,7 +981,11 @@
link = intern->file_name.s;
}
- ret = readlink(link, buff, MAXPATHLEN-1);
+#ifdef HAVE_SYMLINK
+ ret = readlink(intern->file_name, buff, MAXPATHLEN-1);
+#else
+ ret = -1; /* always fail if not implemented */
+#endif
if (ret == -1) {
zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC,
"Unable to read link %R, error: %s", intern->file_name_type, intern->file_name,
strerror(errno));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
