cvs: /php3 ChangeLog /php3/functions string.c

cmv Fri Nov 12 18:26:52 1999 EDT Modified files: /php3 ChangeLog /php3/functions string.c Log: chop(), trim(), etc. now remove NULL characters as well as whitespace. Index: php3/ChangeLog diff -u php3/ChangeLog:1.792 php3/ChangeLog:1.793 --- php3/ChangeLog:1.792 Fri Nov 12 18:11:29 1999 +++ php3/ChangeLog Fri Nov 12 18:26:20 1999 @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| Nov 15, 1999, Version 3.0.13 +- fixed trim(), chop(), ltrim(), etc. to remove NULL characters as + well. (Colin Viebrock) - krsort() added, although someone forgot to mention it ... (Thies) - Upgraded regex library to alpha3.8 (Sascha) - RFC-854 fix for internal FTP-Code. Commands have to end in "\r\n" (Thies) Index: php3/functions/string.c diff -u php3/functions/string.c:1.201 php3/functions/string.c:1.202 --- php3/functions/string.c:1.201 Fri Oct 8 00:51:52 1999 +++ php3/functions/string.c Fri Nov 12 18:26:21 1999 @@ -30,7 +30,7 @@ */ -/* $Id: string.c,v 1.201 1999/10/08 04:51:52 jah Exp $ */ +/* $Id: string.c,v 1.202 1999/11/12 23:26:21 cmv Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -187,7 +187,7 @@ char *c = str->value.str.val; 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; @@ -209,7 +209,7 @@ char *c = str->value.str.val; 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; @@ -219,7 +219,7 @@ c+=trimmed; 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; @@ -237,7 +237,7 @@ char *c = str->value.str.val; 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;