cvs: TSRM / tsrm_virtual_cwd.c

sas Tue Jun 3 20:01:21 2003 EDT Modified files: /TSRM tsrm_virtual_cwd.c Log: cleanup macros Index: TSRM/tsrm_virtual_cwd.c diff -u TSRM/tsrm_virtual_cwd.c:1.47 TSRM/tsrm_virtual_cwd.c:1.48 --- TSRM/tsrm_virtual_cwd.c:1.47 Mon Mar 17 08:40:43 2003 +++ TSRM/tsrm_virtual_cwd.c Tue Jun 3 20:01:21 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tsrm_virtual_cwd.c,v 1.47 2003/03/17 13:40:43 wez Exp $ */ +/* $Id: tsrm_virtual_cwd.c,v 1.48 2003/06/04 00:01:21 sas Exp $ */ #include <sys/types.h> #include <sys/stat.h> @@ -92,7 +92,7 @@ (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 @@ #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 */