Browse Source

- Add comment in macro and remove some now unneeded code

PHP-5
Andi Gutmans 23 years ago
parent
commit
a58e6cc8ad
  1. 3
      TSRM/tsrm_virtual_cwd.c
  2. 5
      TSRM/tsrm_virtual_cwd.h

3
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); copy_amount = COPY_WHEN_ABSOLUTE(path_copy);
is_absolute = 1; is_absolute = 1;
#ifdef TSRM_WIN32 #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])) { } else if (IS_SLASH(path_copy[0])) {
copy_amount = 2; copy_amount = 2;
#endif #endif

5
TSRM/tsrm_virtual_cwd.h

@ -53,9 +53,8 @@ typedef unsigned short mode_t;
#define IS_SLASH_P(c) (*(c) == '/' || \ #define IS_SLASH_P(c) (*(c) == '/' || \
(*(c) == '\\' && !IsDBCSLeadByte(*(c-1)))) (*(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 COPY_WHEN_ABSOLUTE(path) 2
#define IS_UNC_PATH(path, len) \ #define IS_UNC_PATH(path, len) \
(len >= 2 && IS_SLASH(path[0]) && IS_SLASH(path[1])) (len >= 2 && IS_SLASH(path[0]) && IS_SLASH(path[1]))

Loading…
Cancel
Save