[PHP4BETA] CVS update: php4/ext/standard

Date: Wednesday April 21, 1999 @ 15:01 Author: zeev Update of /repository/php4/ext/standard In directory php:/tmp/cvs-serv2832/ext/standard Modified Files: Makefile.am file.c string.c Added Files: flock_compat.c flock_compat.h Log Message: * Rename php_compat.[ch] to flock_compat.[ch] and move it to ext/standard * Fix Win32 compilation Index: php4/ext/standard/Makefile.am diff -c php4/ext/standard/Makefile.am:1.1 php4/ext/standard/Makefile.am:1.2 *** php4/ext/standard/Makefile.am:1.1 Fri Apr 16 20:37:06 1999 --- php4/ext/standard/Makefile.am Wed Apr 21 15:01:38 1999 *************** *** 7,11 **** html.c image.c info.c link.c mail.c math.c md5.c microtime.c \ pack.c pageinfo.c rand.c reg.c soundex.c string.c \ syslog.c type.c uniqid.c url.c iptc.c var.c quot_print.c \ ! cyr_convert.c --- 7,11 ---- html.c image.c info.c link.c mail.c math.c md5.c microtime.c \ pack.c pageinfo.c rand.c reg.c soundex.c string.c \ syslog.c type.c uniqid.c url.c iptc.c var.c quot_print.c \ ! cyr_convert.c flock_compat.c Index: php4/ext/standard/file.c diff -c php4/ext/standard/file.c:1.5 php4/ext/standard/file.c:1.6 *** php4/ext/standard/file.c:1.5 Wed Apr 21 14:10:17 1999 --- php4/ext/standard/file.c Wed Apr 21 15:01:38 1999 *************** *** 13,19 **** | | | B) the PHP License as published by the PHP Development Team and | | included in the distribution in the file: LICENSE | ! | | | This program is distributed in the hope that it will be useful, | | but WITHOUT ANY WARRANTY; without even the implied warranty of | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | --- 13,19 ---- | | | B) the PHP License as published by the PHP Development Team and | | included in the distribution in the file: LICENSE | ! | | | This program is distributed in the hope that it will be useful, | | but WITHOUT ANY WARRANTY; without even the implied warranty of | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | *************** *** 26,37 **** | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ ! /* $Id: file.c,v 1.5 1999/04/21 18:10:17 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif #include "php.h" #include "php_globals.h" #include <stdio.h> #include <stdlib.h> --- 26,38 ---- | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ ! /* $Id: file.c,v 1.6 1999/04/21 19:01:38 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif #include "php.h" #include "php_globals.h" + #include "ext/standard/flock_compat.h" #include <stdio.h> #include <stdlib.h> *************** *** 210,215 **** --- 211,217 ---- php3_module_entry php3_file_module_entry = { "PHP_file", php3_file_functions, php3_minit_file, NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; + static int flock_values[] = { LOCK_SH, LOCK_EX, LOCK_UN }; Index: php4/ext/standard/string.c diff -c php4/ext/standard/string.c:1.4 php4/ext/standard/string.c:1.5 *** php4/ext/standard/string.c:1.4 Wed Apr 21 13:11:01 1999 --- php4/ext/standard/string.c Wed Apr 21 15:01:38 1999 *************** *** 30,36 **** */ ! /* $Id: string.c,v 1.4 1999/04/21 17:11:01 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif --- 30,36 ---- */ ! /* $Id: string.c,v 1.5 1999/04/21 19:01:38 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif *************** *** 1297,1303 **** { char *p; ! for(p = s; (p - s) < n; p++) if(memcmp(p, c, m) == 0) return p; return NULL; --- 1297,1303 ---- { char *p; ! for(p = s; ((size_t) (p - s)) < n; p++) if(memcmp(p, c, m) == 0) return p; return NULL; -- PHP 4 Beta