From: Sascha Schumann Date: Wed, 4 Jun 2003 00:01:00 +0000 (+0000) Subject: clean up macros X-Git-Tag: php-4.3.3RC1~105 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fbee0b3478c8079e230617721f57b960bcd7d4a;p=php clean up macros --- diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index 2c41fa9bb0..fd27f70666 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -92,7 +92,7 @@ static int php_check_dots(const char *element, int n) (len >= 2 && !php_check_dots(element, len)) #define IS_DIRECTORY_CURRENT(element, len) \ - (len == 1 && ptr[0] == '.') + (len == 1 && element[0] == '.') #elif defined(NETWARE) /* NetWare has strtok() (in LibC) and allows both slashes in paths, like Windows -- @@ -111,12 +111,12 @@ static int php_check_dots(const char *element, int n) #ifndef IS_DIRECTORY_UP #define IS_DIRECTORY_UP(element, len) \ - (len == 2 && memcmp(element, "..", 2) == 0) + (len == 2 && element[0] == '.' && element[1] == '.') #endif #ifndef IS_DIRECTORY_CURRENT #define IS_DIRECTORY_CURRENT(element, len) \ - (len == 1 && ptr[0] == '.') + (len == 1 && element[0] == '.') #endif /* define this to check semantics */