Fix bug #20235.

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index bb5bac0c3a3f0e934b7f3123fdacc6a322357d18..37cb560f6b056ea906a611a2221b9ac780e4fca9 100644 (file)
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -727,7 +727,7 @@ CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC)
        int retval;
        char *p;
 
-       p = virtual_link(path, strlen(path) TSRMLS_CC);
+       p = virtual_link((char *)path, strlen(path) TSRMLS_CC);
        retval = lstat(p, buf);
 
        return retval;
@@ -736,15 +736,12 @@ CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC)
 
 CWD_API int virtual_unlink(const char *path TSRMLS_DC)
 {
-       cwd_state new_state;
        int retval;
+       char *resolved_path;
 
-       CWD_STATE_COPY(&new_state, &CWDG(cwd));
-       virtual_file_ex(&new_state, path, NULL);
+       resolved_path = virtual_link((char *)path, strlen(path) TSRMLS_CC);
+       retval = unlink(resolved_path);
 
-       retval = unlink(new_state.cwd);
-
-       CWD_STATE_FREE(&new_state);
        return retval;
 }