[PHP4BETA] CVS update: php4/functions

Date: Friday April 16, 1999 @ 20:37 Author: ssb Update of /repository/php4/functions In directory php:/tmp/cvs-serv28846/functions Modified Files: adabasd.c head.c mime.c msql.c mysql.c pgsql.c post.c post.h sybase-ct.c sybase.c unified_odbc.c zlib.c Removed Files: base64.c base64.h basic_functions.c basic_functions.h browscap.c cyr_convert.c cyr_convert.h datetime.c datetime.h dir.c dns.c dns.h exec.c exec.h file.c file.h filestat.c formatted_print.c fsock.c fsock.h global.h html.c html.h image.c image.h info.c info.h iptc.c link.c mail.c math.c md5.c md5.h microtime.c microtime.h pack.c pack.h pageinfo.c pageinfo.h php3_browscap.h php3_dir.h php3_filestat.h php3_gd.h php3_iptc.h php3_link.h php3_mail.h php3_string.h php3_syslog.h php3_var.h phpdir.h phpmath.h quot_print.c quot_print.h rand.c reg.c reg.h soundex.c string.c syslog.c type.c type.h uniqid.c uniqid.h url.c url.h var.c Log Message: First commit of re-structuring phase one. We have started using automake in sub-directories and started to move extension code into ext/<name>. For now, I have moved the "standard" extension (which is quite a mix of everything right now) and the GD extension into their own subdirs in ext/. The configure script now also runs configure in the libzend directory automatically and makes sure php4 and libzend use the same config.cache file. To avoid running configure in libzend, use the --no-recursion option. "make" in php4 also builds libzend now. The Apache module doesn't compile right now, but a fix for that is coming up. Index: php4/functions/adabasd.c diff -u php4/functions/adabasd.c:1.2 php4/functions/adabasd.c:1.3 --- php4/functions/adabasd.c:1.2 Thu Apr 8 17:32:57 1999 +++ php4/functions/adabasd.c Fri Apr 16 20:37:08 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: adabasd.c,v 1.2 1999/04/08 21:32:57 zeev Exp $ */ +/* $Id: adabasd.c,v 1.3 1999/04/17 00:37:08 ssb Exp $ */ /* * TODO/FIXME @@ -40,11 +40,12 @@ #endif #include "php.h" -#include "php3_string.h" -#include "functions/head.h" -#include "adabasd.h" #if HAVE_ADABAS && !HAVE_UODBC + +#include "ext/standard/php3_string.h" +#include "functions/head.h" +#include "adabasd.h" adabas_module php3_adabas_module; Index: php4/functions/head.c diff -u php4/functions/head.c:1.3 php4/functions/head.c:1.4 --- php4/functions/head.c:1.3 Sat Apr 10 13:39:08 1999 +++ php4/functions/head.c Fri Apr 16 20:37:10 1999 @@ -26,18 +26,14 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: head.c,v 1.3 1999/04/10 17:39:08 zeev Exp $ */ +/* $Id: head.c,v 1.4 1999/04/17 00:37:10 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif #include <stdio.h> #include "php.h" -#include "reg.h" -#include "php3_string.h" -#include "pageinfo.h" -#include "reg.h" +#include "ext/standard/php3_standard.h" #include "main.h" -#include "datetime.h" #include "head.h" #include "post.h" #ifdef TM_IN_SYS_TIME @@ -48,7 +44,6 @@ #include "php_globals.h" #include "safe_mode.h" -#include "url.h" /* need to figure out some nice way to get rid of these */ Index: php4/functions/mime.c diff -u php4/functions/mime.c:1.2 php4/functions/mime.c:1.3 --- php4/functions/mime.c:1.2 Sat Apr 10 12:25:24 1999 +++ php4/functions/mime.c Fri Apr 16 20:37:10 1999 @@ -26,13 +26,13 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: mime.c,v 1.2 1999/04/10 16:25:24 zeev Exp $ */ +/* $Id: mime.c,v 1.3 1999/04/17 00:37:10 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif #include <stdio.h> #include "php.h" -#include "type.h" +#include "ext/standard/php3_standard.h" #include "post.h" #include "mime.h" #include "zend_globals.h" Index: php4/functions/msql.c diff -u php4/functions/msql.c:1.3 php4/functions/msql.c:1.4 --- php4/functions/msql.c:1.3 Fri Apr 9 15:09:29 1999 +++ php4/functions/msql.c Fri Apr 16 20:37:10 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: msql.c,v 1.3 1999/04/09 19:09:29 zeev Exp $ */ +/* $Id: msql.c,v 1.4 1999/04/17 00:37:10 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -41,8 +41,7 @@ #include "functions/dl.h" #endif #include "php3_msql.h" -#include "functions/reg.h" -#include "php3_string.h" +#include "ext/standard/php3_standard.h" #include "php_globals.h" #if HAVE_MSQL Index: php4/functions/mysql.c diff -u php4/functions/mysql.c:1.7 php4/functions/mysql.c:1.8 --- php4/functions/mysql.c:1.7 Sat Apr 10 12:25:24 1999 +++ php4/functions/mysql.c Fri Apr 16 20:37:10 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysql.c,v 1.7 1999/04/10 16:25:24 zeev Exp $ */ +/* $Id: mysql.c,v 1.8 1999/04/17 00:37:10 ssb Exp $ */ /* TODO: @@ -58,11 +58,7 @@ #include "php.h" #include "php_globals.h" -#if PHP_31 -# include "ext/standard/php3_string.h" -#else -# include "php3_string.h" -#endif +#include "ext/standard/php3_standard.h" #include "php3_mysql.h" #include "php_ini.h" Index: php4/functions/pgsql.c diff -u php4/functions/pgsql.c:1.2 php4/functions/pgsql.c:1.3 --- php4/functions/pgsql.c:1.2 Fri Apr 9 15:09:29 1999 +++ php4/functions/pgsql.c Fri Apr 16 20:37:11 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.2 1999/04/09 19:09:29 zeev Exp $ */ +/* $Id: pgsql.c,v 1.3 1999/04/17 00:37:11 ssb Exp $ */ #include <stdlib.h> @@ -37,7 +37,7 @@ #endif #include "php.h" #include "php3_pgsql.h" -#include "php3_string.h" +#include "ext/standard/php3_standard.h" #include "php_globals.h" #if HAVE_PGSQL Index: php4/functions/post.c diff -u php4/functions/post.c:1.3 php4/functions/post.c:1.4 --- php4/functions/post.c:1.3 Sat Apr 10 12:25:24 1999 +++ php4/functions/post.c Fri Apr 16 20:37:11 1999 @@ -33,10 +33,8 @@ #include <stdio.h> #include "php.h" #include "functions/mime.h" -#include "functions/type.h" -#include "functions/php3_string.h" #include "functions/post.h" -#include "functions/url.h" +#include "ext/standard/php3_standard.h" #include "php_globals.h" #include "zend_globals.h" @@ -492,21 +490,6 @@ } } #endif -} - -void php3_parsestr(INTERNAL_FUNCTION_PARAMETERS) -{ - pval *arg; - char *res = NULL; - - if (getParameters(ht, 1, &arg) == FAILURE) { - WRONG_PARAM_COUNT; - } - convert_to_string(arg); - if (arg->value.str.val && *arg->value.str.val) { - res = estrndup(arg->value.str.val,arg->value.str.len); - } - php3_treat_data(PARSE_STRING, res); } /* Index: php4/functions/post.h diff -u php4/functions/post.h:1.2 php4/functions/post.h:1.3 --- php4/functions/post.h:1.2 Sat Apr 10 12:25:24 1999 +++ php4/functions/post.h Fri Apr 16 20:37:11 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: post.h,v 1.2 1999/04/10 16:25:24 zeev Exp $ */ +/* $Id: post.h,v 1.3 1999/04/17 00:37:11 ssb Exp $ */ #ifndef _POST_H #define _POST_H @@ -39,7 +39,5 @@ extern void php3_treat_data(int arg, char *str); extern void php3_TreatHeaders(void); extern void _php3_parse_gpc_data(char *, char *, pval *track_vars_array); - -extern void php3_parsestr(INTERNAL_FUNCTION_PARAMETERS); #endif Index: php4/functions/sybase-ct.c diff -u php4/functions/sybase-ct.c:1.3 php4/functions/sybase-ct.c:1.4 --- php4/functions/sybase-ct.c:1.3 Fri Apr 9 15:09:29 1999 +++ php4/functions/sybase-ct.c Fri Apr 16 20:37:11 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sybase-ct.c,v 1.3 1999/04/09 19:09:29 zeev Exp $ */ +/* $Id: sybase-ct.c,v 1.4 1999/04/17 00:37:11 ssb Exp $ */ #ifndef MSVC5 @@ -36,7 +36,7 @@ #endif #include "php.h" #include "php3_sybase-ct.h" -#include "php3_string.h" +#include "ext/standard/php3_standard.h" #include "php_globals.h" #if HAVE_SYBASE_CT Index: php4/functions/sybase.c diff -u php4/functions/sybase.c:1.3 php4/functions/sybase.c:1.4 --- php4/functions/sybase.c:1.3 Fri Apr 9 15:09:29 1999 +++ php4/functions/sybase.c Fri Apr 16 20:37:11 1999 @@ -31,7 +31,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sybase.c,v 1.3 1999/04/09 19:09:29 zeev Exp $ */ +/* $Id: sybase.c,v 1.4 1999/04/17 00:37:11 ssb Exp $ */ #ifndef MSVC5 @@ -39,7 +39,7 @@ #endif #include "php.h" #include "php3_sybase.h" -#include "php3_string.h" +#include "ext/standard/php3_standard.h" #include "php_globals.h" #if HAVE_SYBASE Index: php4/functions/unified_odbc.c diff -u php4/functions/unified_odbc.c:1.2 php4/functions/unified_odbc.c:1.3 --- php4/functions/unified_odbc.c:1.2 Thu Apr 8 17:32:57 1999 +++ php4/functions/unified_odbc.c Fri Apr 16 20:37:11 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: unified_odbc.c,v 1.2 1999/04/08 21:32:57 zeev Exp $ */ +/* $Id: unified_odbc.c,v 1.3 1999/04/17 00:37:11 ssb Exp $ */ /* This file is based on the Adabas D extension. * Adabas D will no longer be supported as separate module. @@ -48,13 +48,8 @@ #include <fcntl.h> #include "php.h" -#if PHP_31 -# include "ext/phpdl.h" -# include "ext/standard/php3_string.h" -#else -# include "dl/phpdl.h" -# include "php3_string.h" -#endif +#include "dl/phpdl.h" +#include "ext/standard/php3_standard.h" #include "php3_unified_odbc.h" #include "head.h" #include "snprintf.h" Index: php4/functions/zlib.c diff -u php4/functions/zlib.c:1.2 php4/functions/zlib.c:1.3 --- php4/functions/zlib.c:1.2 Thu Apr 8 17:32:57 1999 +++ php4/functions/zlib.c Fri Apr 16 20:37:11 1999 @@ -22,7 +22,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.2 1999/04/08 21:32:57 zeev Exp $ */ +/* $Id: zlib.c,v 1.3 1999/04/17 00:37:11 ssb Exp $ */ #if !PHP_31 && defined(THREAD_SAFE) #undef THREAD_SAFE #endif @@ -54,11 +54,7 @@ #endif #include "head.h" #include "safe_mode.h" -#if PHP_31 -#include "ext/standard/php3_string.h" -#else -#include "php3_string.h" -#endif +#include "ext/standard/php3_standard.h" #include "php3_zlib.h" #include "fopen-wrappers.h" #if HAVE_PWD_H -- PHP 4 Beta