From: Dmitry Stogov <dmitry@php.net>
Date: Mon, 23 Jul 2007 08:57:04 +0000 (+0000)
Subject: Fixed rename() in ZTS to allow renaming of symbolic links;
X-Git-Tag: php-5.2.4RC1~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ddde210594f443aa9546309b727a15a56ce13a1;p=php

Fixed rename() in ZTS to allow renaming of symbolic links;
Consistent handling of trailing slash
---

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index c2bf2731c8..8e14365abe 100644
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -692,6 +692,15 @@ no_realpath:
 			}
 			ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, &tok);
 		}
+#if defined(TSRM_WIN32) || defined(NETWARE)
+		if (path[path_length-1] == '\\' || path[path_length-1] == '/') {
+#else 
+		if (path[path_length-1] == '/') {
+#endif
+			state->cwd = (char*)realloc(state->cwd, state->cwd_length + 2);
+			state->cwd[state->cwd_length++] = DEFAULT_SLASH;
+			state->cwd[state->cwd_length] = 0;
+		}
 
 		free(free_path);
 
@@ -979,14 +988,14 @@ CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&old_state, &CWDG(cwd));
-	if (virtual_file_ex(&old_state, oldname, NULL, CWD_REALPATH)) {
+	if (virtual_file_ex(&old_state, oldname, NULL, CWD_EXPAND)) {
 		CWD_STATE_FREE(&old_state);
 		return -1;
 	}
 	oldname = old_state.cwd;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, newname, NULL, CWD_FILEPATH)) {
+	if (virtual_file_ex(&new_state, newname, NULL, CWD_EXPAND)) {
 		CWD_STATE_FREE(&old_state);
 		CWD_STATE_FREE(&new_state);
 		return -1;