diff options
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index b93c5e51eb..80e09e5dec 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -364,10 +364,14 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func } } else if (!IS_DIRECTORY_CURRENT(ptr, ptr_length)) { state->cwd = (char *) realloc(state->cwd, state->cwd_length+ptr_length+1+1); - state->cwd[state->cwd_length] = DEFAULT_SLASH; - memcpy(&state->cwd[state->cwd_length+1], ptr, ptr_length+1); - state->cwd_length += (ptr_length+1); - } +#ifdef TSRM_WIN32 + /* Windows 9x will consider C:\\Foo as a network path. Avoid it. */ + if (state->cwd[state->cwd_length-1]!=DEFAULT_SLASH) { + state->cwd[state->cwd_length++] = DEFAULT_SLASH; + } +#endif + memcpy(&state->cwd[state->cwd_length], ptr, ptr_length+1); + state->cwd_length += ptr_length; } ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, &tok); } |