pajoye Tue Jun 16 16:53:56 2009 UTC
Modified files:
/php-src/ext/standard link_win32.c
Log:
- MF53: fix readlink in TS SAPI
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/link_win32.c?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/standard/link_win32.c
diff -u php-src/ext/standard/link_win32.c:1.5
php-src/ext/standard/link_win32.c:1.6
--- php-src/ext/standard/link_win32.c:1.5 Wed Jun 3 08:07:29 2009
+++ php-src/ext/standard/link_win32.c Tue Jun 16 16:53:56 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: link_win32.c,v 1.5 2009/06/03 08:07:29 pajoye Exp $ */
+/* $Id: link_win32.c,v 1.6 2009/06/16 16:53:56 pajoye Exp $ */
#ifdef PHP_WIN32
#include "php.h"
@@ -62,6 +62,7 @@
char *link;
int link_len;
TCHAR Path[MAXPATHLEN];
+ char path_resolved[MAXPATHLEN];
HANDLE hFile;
DWORD dwRet;
@@ -88,14 +89,17 @@
if (OPENBASEDIR_CHECKPATH(link)) {
RETURN_FALSE;
}
-
- hFile = CreateFile(link, // file to open
-
GENERIC_READ, // open for reading
-
FILE_SHARE_READ, // share for reading
-
NULL, // default security
-
OPEN_EXISTING, // existing file only
-
FILE_FLAG_BACKUP_SEMANTICS, // normal file
-
NULL); // no attr. template
+ if (!expand_filepath(link, path_resolved TSRMLS_CC)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such file or
directory");
+ RETURN_FALSE;
+ }
+ hFile = CreateFile(path_resolved, // file to open
+ GENERIC_READ, // open for reading
+ FILE_SHARE_READ, // share for reading
+ NULL, // default security
+ OPEN_EXISTING, // existing file only
+ FILE_FLAG_BACKUP_SEMANTICS, // normal file
+ NULL); // no attr. template
if( hFile == INVALID_HANDLE_VALUE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not
open file (error %d)", GetLastError());
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
