cvs: php4 /ext/standard/ string.c
| From: | Rasmus Lerdorf | Date: | Wed, 07 Jun 2000 00:59:14 +0000 |
| Subject: | cvs: php4 /ext/standard/ string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64@lists.php.net to get a copy of this message | ||
rasmus Tue Jun 6 17:59:14 2000 EDT
Modified files:
/php4/ext/standard string.c
Log:
Make trim strip \0 to match php 3
@ Make trim strip \0 to match php 3 (Rasmus)
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.125 php4/ext/standard/string.c:1.126
--- php4/ext/standard/string.c:1.125 Tue Jun 6 13:42:33 2000
+++ php4/ext/standard/string.c Tue Jun 6 17:59:14 2000
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.125 2000/06/06 20:42:33 andrei Exp $ */
+/* $Id: string.c,v 1.126 2000/06/07 00:59:14 rasmus Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -133,7 +133,7 @@
if (mode & 1) {
for (i = 0; i < len; i++) {
if (c[i] == ' ' || c[i] == '\n' || c[i] == '\r' ||
- c[i] == '\t' || c[i] == '\v') {
+ c[i] == '\t' || c[i] == '\v' || c[i] == '\0') {
trimmed++;
} else {
break;
@@ -145,7 +145,7 @@
if (mode & 2) {
for (i = len - 1; i >= 0; i--) {
if (c[i] == ' ' || c[i] == '\n' || c[i] == '\r' ||
- c[i] == '\t' || c[i] == '\v') {
+ c[i] == '\t' || c[i] == '\v' || c[i] == '\0') {
len--;
} else {
break;