[PHP4BETA] CVS update: php4/ext/standard
| From: | sas | Date: | Wed, 21 Apr 1999 17:11:01 +0000 |
| Subject: | [PHP4BETA] CVS update: php4/ext/standard | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-228@lists.php.net to get a copy of this message | ||
Date: Wednesday April 21, 1999 @ 13:11
Author: sas
Update of /repository/php4/ext/standard
In directory php:/tmp/cvs-serv10645/ext/standard
Modified Files:
datetime.c reg.c string.c
Log Message:
port some fixes, add compat routines
Index: php4/ext/standard/datetime.c
diff -c php4/ext/standard/datetime.c:1.1 php4/ext/standard/datetime.c:1.2
*** php4/ext/standard/datetime.c:1.1 Fri Apr 16 20:37:06 1999
--- php4/ext/standard/datetime.c Wed Apr 21 13:11:01 1999
***************
*** 30,36 ****
*/
! /* $Id: datetime.c,v 1.1 1999/04/17 00:37:06 ssb Exp $ */
#ifdef THREAD_SAFE
--- 30,36 ----
*/
! /* $Id: datetime.c,v 1.2 1999/04/21 17:11:01 sas Exp $ */
#ifdef THREAD_SAFE
***************
*** 463,468 ****
--- 463,469 ----
char *format,*buf;
time_t timestamp;
struct tm *ta;
+ int max_reallocs = 5;
size_t buf_len=64, real_len;
switch (ARG_COUNT(ht)) {
***************
*** 495,505 ****
while ((real_len=strftime(buf,buf_len,format,ta))==buf_len || real_len==0) {
buf_len *= 2;
buf = (char *) erealloc(buf, buf_len);
}
! return_value->value.str.val = (char *) erealloc(buf,real_len+1);
! return_value->value.str.len = real_len;
! return_value->type = IS_STRING;
}
#endif
/*
--- 496,510 ----
while ((real_len=strftime(buf,buf_len,format,ta))==buf_len || real_len==0) {
buf_len *= 2;
buf = (char *) erealloc(buf, buf_len);
+ if(!--max_reallocs) break;
}
! if(real_len && real_len != buf_len) {
! buf = (char *) erealloc(buf,real_len+1);
! RETURN_STRINGL(buf, real_len, 0);
! }
! efree(buf);
! RETURN_FALSE;
}
#endif
/*
Index: php4/ext/standard/reg.c
diff -c php4/ext/standard/reg.c:1.1 php4/ext/standard/reg.c:1.2
*** php4/ext/standard/reg.c:1.1 Fri Apr 16 20:37:07 1999
--- php4/ext/standard/reg.c Wed Apr 21 13:11:01 1999
***************
*** 28,34 ****
| Jaakko Hyvätti <jaakko@hyvatti.iki.fi> |
+----------------------------------------------------------------------+
*/
! /* $Id: reg.c,v 1.1 1999/04/17 00:37:07 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 28,34 ----
| Jaakko Hyvätti <jaakko@hyvatti.iki.fi> |
+----------------------------------------------------------------------+
*/
! /* $Id: reg.c,v 1.2 1999/04/21 17:11:01 sas Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 537,543 ****
{
pval *string;
char *tmp;
! register int i;
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &string)==FAILURE) {
WRONG_PARAM_COUNT;
--- 537,544 ----
{
pval *string;
char *tmp;
! unsigned char c;
! register int i, j;
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &string)==FAILURE) {
WRONG_PARAM_COUNT;
***************
*** 547,563 ****
tmp = (char *) emalloc(string->value.str.len*4+1);
! for (i=0; i<string->value.str.len; i++) {
! tmp[i*4] = '[';
! tmp[i*4+1]=toupper((unsigned char)string->value.str.val[i]);
! tmp[i*4+2]=tolower((unsigned char)string->value.str.val[i]);
! tmp[i*4+3]=']';
}
! tmp[string->value.str.len*4]=0;
! return_value->value.str.val = tmp;
! return_value->value.str.len = string->value.str.len*4;
! return_value->type = IS_STRING;
}
/* }}} */
--- 548,569 ----
tmp = (char *) emalloc(string->value.str.len*4+1);
! for (i=j=0; i<string->value.str.len; i++) {
! c = (unsigned char) string->value.str.val[i];
! if(isalpha(c)) {
! tmp[j++] = '[';
! tmp[j++] = toupper(c);
! tmp[j++] = tolower(c);
! tmp[j++] = ']';
! } else {
! tmp[j++] = c;
! }
}
! tmp[j]=0;
!
! tmp = erealloc(tmp, j + 1);
! RETVAL_STRINGL(tmp, j, 0);
}
/* }}} */
Index: php4/ext/standard/string.c
diff -c php4/ext/standard/string.c:1.3 php4/ext/standard/string.c:1.4
*** php4/ext/standard/string.c:1.3 Wed Apr 21 12:31:25 1999
--- php4/ext/standard/string.c Wed Apr 21 13:11:01 1999
***************
*** 30,36 ****
*/
! /* $Id: string.c,v 1.3 1999/04/21 16:31:25 sas Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 30,36 ----
*/
! /* $Id: string.c,v 1.4 1999/04/21 17:11:01 sas Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 972,978 ****
if(*(r+1)){
r++;
*r=toupper((unsigned char)*r);
! }
}
RETVAL_STRING(arg->value.str.val,1);
}
--- 972,978 ----
if(*(r+1)){
r++;
*r=toupper((unsigned char)*r);
! } else break;
}
RETVAL_STRING(arg->value.str.val,1);
}
--
PHP 4 Beta