From: Dmitry Stogov <dmitry@php.net>
Date: Tue, 10 Jul 2007 13:21:31 +0000 (+0000)
Subject: Fixed symlink("", "somthing") and link("", "somthing") in ZTS mode
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~269
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f8c60832069a46a3c49b6ba0e96b74f7f418fdb;p=php

Fixed symlink("", "somthing") and link("", "somthing") in ZTS mode
---

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index 512d615cd7..5786e0d130 100644
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -481,7 +481,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	use_cache = ((use_realpath != CWD_EXPAND) && CWDG(realpath_cache_size_limit));
 
 	if (path_length == 0) 
-		return (0);
+		return (1);
 	if (path_length >= MAXPATHLEN)
 		return (1);
 
@@ -769,9 +769,24 @@ CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC)
 {
 	cwd_state new_state;
 	char *retval;
+	char cwd[MAXPATHLEN];
+
+	/* realpath("") returns CWD */
+	if (!*path) {
+		new_state.cwd = (char*)malloc(1);
+		new_state.cwd[0] = '\0';
+		new_state.cwd_length = 0;		
+	    if (VCWD_GETCWD(cwd, MAXPATHLEN)) {
+		    path = cwd;
+		}
+	} else if (!IS_ABSOLUTE_PATH(path, strlen(path))) {
+		CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	} else {
+		new_state.cwd = (char*)malloc(1);
+		new_state.cwd[0] = '\0';
+		new_state.cwd_length = 0;		
+	}
 
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	
 	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)==0) {
 		int len = new_state.cwd_length>MAXPATHLEN-1?MAXPATHLEN-1:new_state.cwd_length;
 
@@ -1202,7 +1217,15 @@ CWD_API char *tsrm_realpath(const char *path, char *real_path TSRMLS_DC)
 	cwd_state new_state;
 	char cwd[MAXPATHLEN];
 
-	if (!IS_ABSOLUTE_PATH(path, strlen(path)) &&
+	/* realpath("") returns CWD */
+	if (!*path) {
+		new_state.cwd = (char*)malloc(1);
+		new_state.cwd[0] = '\0';
+		new_state.cwd_length = 0;		
+	    if (VCWD_GETCWD(cwd, MAXPATHLEN)) {
+		    path = cwd;
+		}
+	} else if (!IS_ABSOLUTE_PATH(path, strlen(path)) &&
 	    VCWD_GETCWD(cwd, MAXPATHLEN)) {
 		new_state.cwd = strdup(cwd);
 		new_state.cwd_length = strlen(cwd);
diff --git a/ext/standard/link.c b/ext/standard/link.c
index 357a06c5d6..241851bb9b 100644
--- a/ext/standard/link.c
+++ b/ext/standard/link.c
@@ -135,6 +135,7 @@ PHP_FUNCTION(symlink)
 	}
 
 	if (!expand_filepath(frompath, source_p TSRMLS_CC) || !expand_filepath(topath, dest_p TSRMLS_CC)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such file or directory");
 		RETURN_FALSE;
 	}
 
@@ -185,6 +186,7 @@ PHP_FUNCTION(link)
 	}
 
 	if (!expand_filepath(frompath, source_p TSRMLS_CC) || !expand_filepath(topath, dest_p TSRMLS_CC)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such file or directory");
 		RETURN_FALSE;
 	}
 
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt
index 71ad685eaa..6d0df4f34b 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt
@@ -67,6 +67,7 @@ echo "Done\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/symlink_link_linkinfo_is_link_error1.tmp");
+@unlink(dirname(__FILE__)."/symlink_link_linkinfo_is_link_link_error1.tmp");
 ?>
 --EXPECTF--
 *** Testing symlink() for error conditions ***
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 895afc4a6c..259b88f848 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -579,7 +579,9 @@ PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC)
 	char cwd[MAXPATHLEN];
 	char *result;
 
-	if (IS_ABSOLUTE_PATH(filepath, strlen(filepath))) {
+	if (!filepath[0]) {
+		return NULL;
+	} else if (IS_ABSOLUTE_PATH(filepath, strlen(filepath))) {
 		cwd[0] = '\0';
 	} else{
 		result = VCWD_GETCWD(cwd, MAXPATHLEN);