cvs: php4 /ext/standard string.c
| From: | Ilia Alshanetsky | Date: | Fri, 01 Nov 2002 00:53:28 +0000 |
| Subject: | cvs: php4 /ext/standard string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-15688@lists.php.net to get a copy of this message | ||
iliaa Thu Oct 31 19:53:28 2002 EDT
Modified files:
/php4/ext/standard string.c
Log:
Fixed bug #18710. dirname() now returns consistent output when dealing with
\ directory separators on Windows.
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.330 php4/ext/standard/string.c:1.331
--- php4/ext/standard/string.c:1.330 Wed Oct 30 06:42:51 2002
+++ php4/ext/standard/string.c Thu Oct 31 19:53:27 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.330 2002/10/30 11:42:51 moriyoshi Exp $ */
+/* $Id: string.c,v 1.331 2002/11/01 00:53:27 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1148,7 +1148,7 @@
}
if (end < path) {
/* The path only contained slashes */
- path[0] = DEFAULT_SLASH;
+ path[0] = '/';
path[1] = '\0';
return;
}
@@ -1169,7 +1169,7 @@
end--;
}
if (end < path) {
- path[0] = DEFAULT_SLASH;
+ path[0] = '/';
path[1] = '\0';
return;
}