cvs: /php4/ext/imap config.m4 /php4/ext/pgsql config.m4 /php4/ext/snmp config.m4 /php4/ext/xml config.m4 php3_xml.h xml.c

ssb Wed Jul 21 10:43:13 1999 EDT Modified files: /php4/ext/imap config.m4 /php4/ext/pgsql config.m4 /php4/ext/snmp config.m4 /php4/ext/xml config.m4 php3_xml.h xml.c Log: Debian fixes Index: php4/ext/imap/config.m4 diff -u php4/ext/imap/config.m4:1.6 php4/ext/imap/config.m4:1.7 --- php4/ext/imap/config.m4:1.6 Thu Jul 15 08:42:46 1999 +++ php4/ext/imap/config.m4 Wed Jul 21 10:43:12 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 1999/07/15 12:42:46 rasmus Exp $ +dnl $Id: config.m4,v 1.7 1999/07/21 14:43:12 ssb Exp $ AC_MSG_CHECKING(for IMAP support) AC_ARG_WITH(imap, @@ -11,12 +11,16 @@ withval=/usr elif test -f /usr/include/imap/mail.h; then withval=/usr + elif test -f /usr/include/c-client/mail.h; then + withval=/usr fi fi if test "$withval" != "no" && test "$withval" != "yes"; then IMAP_DIR=$withval if test -f $IMAP_DIR/include/imap/mail.h; then IMAP_INC_DIR=$IMAP_DIR/include/imap + elif test -f $IMAP_DIR/include/c-client/mail.h; then + IMAP_INC_DIR=$IMAP_DIR/include/c-client else IMAP_INC_DIR=$withval/include fi Index: php4/ext/pgsql/config.m4 diff -u php4/ext/pgsql/config.m4:1.2 php4/ext/pgsql/config.m4:1.3 --- php4/ext/pgsql/config.m4:1.2 Sun Jun 20 14:52:45 1999 +++ php4/ext/pgsql/config.m4 Wed Jul 21 10:43:12 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/06/20 18:52:45 sas Exp $ +dnl $Id: config.m4,v 1.3 1999/07/21 14:43:12 ssb Exp $ AC_MSG_CHECKING(for PostgresSQL support) AC_ARG_WITH(pgsql, @@ -12,6 +12,7 @@ else PGSQL_INCDIR=$withval/include test -d $withval/include/pgsql && PGSQL_INCDIR=$withval/include/pgsql + test -d $withval/include/postgresql && PGSQL_INCDIR=$withval/include/postgresql PGSQL_LIBDIR=$withval/lib test -d $withval/lib/pgsql && PGSQL_LIBDIR=$withval/lib/pgsql fi Index: php4/ext/snmp/config.m4 diff -u php4/ext/snmp/config.m4:1.4 php4/ext/snmp/config.m4:1.5 --- php4/ext/snmp/config.m4:1.4 Sun Jun 27 17:45:06 1999 +++ php4/ext/snmp/config.m4 Wed Jul 21 10:43:12 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 1999/06/27 21:45:06 sas Exp $ +dnl $Id: config.m4,v 1.5 1999/07/21 14:43:12 ssb Exp $ AC_MSG_CHECKING(for SNMP support) AC_ARG_WITH(snmp, @@ -12,6 +12,7 @@ SNMP_LIBDIR=/usr/local/lib test -d /usr/local/include/ucd-snmp && SNMP_INCDIR=/usr/local/include/ucd-snmp test -d /usr/include/ucd-snmp && SNMP_INCDIR=/usr/include/ucd-snmp + test -d /usr/include/snmp && SNMP_INCDIR=/usr/include/snmp test -f /usr/lib/libsnmp.a && SNMP_LIBDIR=/usr/lib else SNMP_INCDIR=$withval/include Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.1 php4/ext/xml/config.m4:1.2 --- php4/ext/xml/config.m4:1.1 Wed Apr 21 22:48:27 1999 +++ php4/ext/xml/config.m4 Wed Jul 21 10:43:12 1999 @@ -1,15 +1,24 @@ -dnl $Id: config.m4,v 1.1 1999/04/22 02:48:27 ssb Exp $ +# $Source: /local/repository/php4/ext/xml/config.m4,v $ +# $Id: config.m4,v 1.2 1999/07/21 14:43:12 ssb Exp $ AC_MSG_CHECKING(for XML support) AC_ARG_WITH(xml, [ --with-xml Include XML support],[ if test "$withval" != "no"; then if test "$withval" = "yes"; then - XML_LIBS="-lexpat" - XML_INCLUDE="" + test -d /usr/include/xmltok && XML_INCLUDE="-I/usr/include/xmltok" + test -d /usr/include/xml && XML_INCLUDE="-I/usr/include/xml" + test -d /usr/local/include/xml && XML_INCLUDE="-I/usr/local/include/xml" + test -d /usr/include/xml && XML_INCLUDE="-I/usr/include/xml" + XML_INCLUDE="-I/usr/include/xml" + AC_CHECK_LIB(expat, main, XML_LIBS="-lexpat", XML_LIBS="-lxmlparse -lxmltok") else XML_LIBS="-L$withval/lib -lexpat" - XML_INCLUDE="-I$withval/include" + if test -d $withval/include/xml; then + XML_INCLUDE="-I$withval/include/xml" + else + XML_INCLUDE="-I$withval/include" + fi fi AC_DEFINE(HAVE_LIBEXPAT, 1) AC_MSG_RESULT(yes) Index: php4/ext/xml/php3_xml.h diff -u php4/ext/xml/php3_xml.h:1.4 php4/ext/xml/php3_xml.h:1.5 --- php4/ext/xml/php3_xml.h:1.4 Fri Jul 2 11:31:02 1999 +++ php4/ext/xml/php3_xml.h Wed Jul 21 10:43:12 1999 @@ -27,16 +27,16 @@ +----------------------------------------------------------------------+ */ -/* $Id: php3_xml.h,v 1.4 1999/07/02 15:31:02 thies Exp $ */ +/* $Id: php3_xml.h,v 1.5 1999/07/21 14:43:12 ssb Exp $ */ -#if HAVE_LIBEXPAT -# ifndef _PHP_XML_H -# define _PHP_XML_H -# endif +#ifndef _PHP_XML_H +# define _PHP_XML_H -#include <xml/xmltok.h> -#include <xml/xmlparse.h> +# if HAVE_LIBEXPAT +#include <xmltok.h> +#include <xmlparse.h> + #ifdef XML_UNICODE # error "UTF-16 Unicode support not implemented!" #endif @@ -128,6 +128,8 @@ #endif /* HAVE_LIBEXPAT */ #define phpext_xml_ptr xml_module_ptr + +# endif /* _PHP_XML_H */ /* * Local variables: Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.11 php4/ext/xml/xml.c:1.12 --- php4/ext/xml/xml.c:1.11 Fri Jul 16 09:12:58 1999 +++ php4/ext/xml/xml.c Wed Jul 21 10:43:12 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.11 1999/07/16 13:12:58 zeev Exp $ */ +/* $Id: xml.c,v 1.12 1999/07/21 14:43:12 ssb Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # if PHP_31 @@ -92,28 +92,45 @@ #if PHP_API_VERSION >= 19990421 #define php3tls_pval_destructor(a) zval_dtor(a) #endif -static pval *php3i_long_pval(long value) + /* {{{ php3i_long_pval() */ + +PHPAPI pval *php3i_long_pval(long value) +{ + pval *ret = emalloc(sizeof(pval)); + + ret->type = IS_LONG; + ret->value.lval = value; + return ret; +} + +/* }}} */ + /* {{{ php3i_double_pval() */ + +PHPAPI pval *php3i_double_pval(double value) { - pval *ret = emalloc(sizeof(pval)); - - ret->type = IS_LONG; - ret->value.lval = value; - INIT_PZVAL(ret); - return ret; -} - -static pval *php3i_string_pval(const char *str) -{ - pval *ret = emalloc(sizeof(pval)); - int len = strlen(str); - - ret->type = IS_STRING; - ret->value.str.len = len; - INIT_PZVAL(ret); - ret->value.str.val = estrndup(str, len); - return ret; -} + pval *ret = emalloc(sizeof(pval)); + + ret->type = IS_DOUBLE; + ret->value.dval = value; + return ret; +} + +/* }}} */ + /* {{{ php3i_string_pval() */ +PHPAPI pval *php3i_string_pval(const char *str) +{ + pval *ret = emalloc(sizeof(pval)); + int len = strlen(str); + + ret->type = IS_STRING; + ret->value.str.len = len; + ret->value.str.val = estrndup(str, len); + return ret; +} + +/* }}} */ + /* end of UGLY HACK!!! */ @@ -617,8 +634,22 @@ return len; } +/* }}} */ + /* {{{ php3i_pval_strdup() */ + +PHPAPI char *php3i_pval_strdup(pval *val) +{ + if (val->type == IS_STRING) { + char *buf = emalloc(val->value.str.len + 1); + memcpy(buf, val->value.str.val, val->value.str.len); + buf[val->value.str.len] = '\0'; + return buf; + } + return NULL; +} + /* }}} */ -/* {{{ php3i_add_to_info */ + /* {{{ php3i_add_to_info */ static void php3i_add_to_info(xml_parser *parser,char *name) { pval **element, *values; @@ -645,7 +676,7 @@ } /* }}} */ -/* {{{ php3i_xml_startElementHandler() */ + /* {{{ php3i_xml_startElementHandler() */ void php3i_xml_startElementHandler(void *userData, const char *name, const char **attributes)