cvs: TSRM(PHP_4_3) / tsrm_virtual_cwd.c
| From: | Sascha Schumann | Date: | Wed, 04 Jun 2003 00:01:01 +0000 |
| Subject: | cvs: TSRM(PHP_4_3) / tsrm_virtual_cwd.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-1314@lists.php.net to get a copy of this message | ||
sas Tue Jun 3 20:01:01 2003 EDT
Modified files: (Branch: PHP_4_3)
/TSRM tsrm_virtual_cwd.c
Log:
clean up macros
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.41.2.2 TSRM/tsrm_virtual_cwd.c:1.41.2.3
--- TSRM/tsrm_virtual_cwd.c:1.41.2.2 Mon Mar 17 08:50:21 2003
+++ TSRM/tsrm_virtual_cwd.c Tue Jun 3 20:01:00 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.41.2.2 2003/03/17 13:50:21 wez Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.41.2.3 2003/06/04 00:01:00 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 */