[binaryphp-cvs] binaryphp/functions/string str_repeat.cpp,1.1,1.2 str_replace.cpp,1.1,1.2 strlen.cpp,1.1,1.2 strtolower.cpp,1.1,1.2 substr.cpp,1.1,1.2

[<ama...@us...>]

Update of /cvsroot/binaryphp/binaryphp/functions/string
In directory sc8-pr-cvs1:/tmp/cvs-serv4644/functions/string

Modified Files:
	str_repeat.cpp str_replace.cpp strlen.cpp strtolower.cpp 
	substr.cpp 
Log Message:
Added support for header().


Index: str_repeat.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/functions/string/str_repeat.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** str_repeat.cpp	3 Aug 2003 06:36:03 -0000	1.1
--- str_repeat.cpp	11 Aug 2003 11:17:22 -0000	1.2
***************
*** 1,15 ****
! php_var str_repeat(php_var input, php_var multiplier) {
! 	char *out;
! 	php_var retval;
! 	int i=(int)multiplier;
! 	if(i == 0)
! 		return (php_var)"";
! 	out=(char*)malloc(i*strlen(input)+1);
! 	memset(out,0,i*strlen(input)+1);
! 
! 	for(;i>=1;i--)
! 		sprintf(out,"%s%s",out,(const char*)input);
! 	retval=out;
! 	free(out);
! 	return retval;
! }
--- 1,15 ----
! php_var str_repeat(php_var input, php_var multiplier) {
! 	char *out;
! 	php_var retval;
! 	int i=(int)multiplier;
! 	if(i == 0)
! 		return (php_var)"";
! 	out=(char*)malloc(i*strlen(input)+1);
! 	memset(out,0,i*strlen(input)+1);
! 
! 	for(;i>=1;i--)
! 		sprintf(out,"%s%s",out,(const char*)input);
! 	retval=out;
! 	free(out);
! 	return retval;
! }

Index: str_replace.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/functions/string/str_replace.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** str_replace.cpp	3 Aug 2003 06:36:03 -0000	1.1
--- str_replace.cpp	11 Aug 2003 11:17:22 -0000	1.2
***************
*** 1,31 ****
! /* NO LIMIT SUPPORT */
! php_var str_replace(php_var search, php_var replace, php_var subject) {
! 	php_var retval=subject;
! 	int i;
! 	if(search.type == PHP_STRING) {
! 		char *tmp1;
! 		char *tmp2;
! 		char *ptr;
! 		tmp1=(char*)malloc(strlen(subject)+1);
! 		memset(tmp1,0,strlen(subject));
! 		strcpy(tmp1,subject);
! 		while(ptr = strstr(tmp1, (const char *)search))
! 		{
! 			*ptr = '\0';
! 			i=strlen(tmp1)+(int)(strlen(replace))+(int)(strlen(search))+1;
! 			tmp2=(char*)malloc(i);
! 			memset(tmp2,0,i);
! 			sprintf(tmp2,"%s%s%s",tmp1,(const char*)replace,(const char*)(ptr+(int)(strlen(search))));
! 			sprintf(tmp1,"%s",tmp2);
! 			free(tmp2);
! 		}
! 		retval=(char*)tmp1;
! 		free(tmp1);
! 	} else if (search.type == PHP_ARRAY) {
! 		for(i = 0;i < search.data.size(); ++i)
! 		{
! 			retval=str_replace(search.data[i],replace.data[i],retval);
! 		}
! 	}
! 	return retval;
  }
--- 1,31 ----
! /* NO LIMIT SUPPORT */
! php_var str_replace(php_var search, php_var replace, php_var subject) {
! 	php_var retval=subject;
! 	int i;
! 	if(search.type == PHP_STRING) {
! 		char *tmp1;
! 		char *tmp2;
! 		char *ptr;
! 		tmp1=(char*)malloc(strlen(subject)+1);
! 		memset(tmp1,0,strlen(subject));
! 		strcpy(tmp1,subject);
! 		while(ptr = strstr(tmp1, (const char *)search))
! 		{
! 			*ptr = '\0';
! 			i=strlen(tmp1)+(int)(strlen(replace))+(int)(strlen(search))+1;
! 			tmp2=(char*)malloc(i);
! 			memset(tmp2,0,i);
! 			sprintf(tmp2,"%s%s%s",tmp1,(const char*)replace,(const char*)(ptr+(int)(strlen(search))));
! 			sprintf(tmp1,"%s",tmp2);
! 			free(tmp2);
! 		}
! 		retval=(char*)tmp1;
! 		free(tmp1);
! 	} else if (search.type == PHP_ARRAY) {
! 		for(i = 0;i < search.data.size(); ++i)
! 		{
! 			retval=str_replace(search.data[i],replace.data[i],retval);
! 		}
! 	}
! 	return retval;
  }

Index: strlen.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/functions/string/strlen.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** strlen.cpp	3 Aug 2003 06:36:03 -0000	1.1
--- strlen.cpp	11 Aug 2003 11:17:22 -0000	1.2
***************
*** 1,8 ****
! php_var strlen(php_var str)
! {
! 	return (php_var) str.container.length();
! }
! php_var strlen(string str)
! {
! 	return (php_var) str.length();
  }
--- 1,8 ----
! php_var strlen(php_var str)
! {
! 	return (php_var) str.container.length();
! }
! php_var strlen(string str)
! {
! 	return (php_var) str.length();
  }

Index: strtolower.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/functions/string/strtolower.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** strtolower.cpp	3 Aug 2003 06:36:03 -0000	1.1
--- strtolower.cpp	11 Aug 2003 11:17:22 -0000	1.2
***************
*** 1,7 ****
! php_var strtolower(php_var str)
! {
! 	for(int i = 0; i < str.container.length(); i++)
! 		str.container[i] = tolower(str.container[i]);
! 
! 	return (php_var) str;
! }
--- 1,7 ----
! php_var strtolower(php_var str)
! {
! 	for(int i = 0; i < str.container.length(); i++)
! 		str.container[i] = tolower(str.container[i]);
! 
! 	return (php_var) str;
! }

Index: substr.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/functions/string/substr.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** substr.cpp	5 Aug 2003 06:19:29 -0000	1.1
--- substr.cpp	11 Aug 2003 11:17:22 -0000	1.2
***************
*** 1,12 ****
! php_var substr(php_var str, php_var pos, php_var len)
! {
! 	if(len == 0)
! 		len = str.container.length() - pos;
! 	return (php_var) str.container.substr(pos, len);
! }
! php_var substr(php_var str, long pos, long len)
! {
! 	if(len == 0)
! 		len = str.container.length() - pos;
! 	return (php_var) str.container.substr(pos, len);
  }
--- 1,12 ----
! php_var substr(php_var str, php_var pos, php_var len)
! {
! 	if(len == 0)
! 		len = str.container.length() - pos;
! 	return (php_var) str.container.substr(pos, len);
! }
! php_var substr(php_var str, long pos, long len)
! {
! 	if(len == 0)
! 		len = str.container.length() - pos;
! 	return (php_var) str.container.substr(pos, len);
  }