diff options
| author | Andi Gutmans <andi@php.net> | 2002-12-20 08:42:50 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2002-12-20 08:42:50 +0000 |
| commit | a58e6cc8ade50a80ee00514c2eca34553f5ff0e4 (patch) | |
| tree | d8b9241bf273aba03c624b7c130bfaaa100206ab | |
| parent | 6f6631ad14d4fb1f0edca8c4742da81d36efa062 (diff) | |
| download | php-git-a58e6cc8ade50a80ee00514c2eca34553f5ff0e4.tar.gz | |
- Add comment in macro and remove some now unneeded code
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 3 | ||||
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.h | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index 12c35e1ced..22dd592ed9 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -340,9 +340,6 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func copy_amount = COPY_WHEN_ABSOLUTE(path_copy); is_absolute = 1; #ifdef TSRM_WIN32 - } else if (IS_UNC_PATH(path_copy, path_length)) { - copy_amount = 2; - is_absolute = 1; } else if (IS_SLASH(path_copy[0])) { copy_amount = 2; #endif diff --git a/TSRM/tsrm_virtual_cwd.h b/TSRM/tsrm_virtual_cwd.h index 47bc587da8..c172759a9f 100644 --- a/TSRM/tsrm_virtual_cwd.h +++ b/TSRM/tsrm_virtual_cwd.h @@ -53,9 +53,8 @@ typedef unsigned short mode_t; #define IS_SLASH_P(c) (*(c) == '/' || \ (*(c) == '\\' && !IsDBCSLeadByte(*(c-1)))) -/* COPY_WHEN_ABSOLUTE also takes path as argument because netware needs it - * to account for volume name that is unique to NetWare absolute paths - */ +/* COPY_WHEN_ABSOLUTE is 2 under Win32 because by chance both regular absolute paths + in the file system and UNC paths need copying of two characters */ #define COPY_WHEN_ABSOLUTE(path) 2 #define IS_UNC_PATH(path, len) \ (len >= 2 && IS_SLASH(path[0]) && IS_SLASH(path[1])) |