helly Tue Nov 26 07:05:59 2002 EDT
Added files:
/php4/ext/dba dba_db4.c php_db4.h
Modified files:
/php4/ext/dba config.m4 dba.c
Log:
Add Berkeley db4 support
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.31 php4/ext/dba/config.m4:1.32
--- php4/ext/dba/config.m4:1.31 Tue Nov 26 07:00:25 2002
+++ php4/ext/dba/config.m4 Tue Nov 26 07:05:59 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.31 2002/11/26 12:00:25 helly Exp $
+dnl $Id: config.m4,v 1.32 2002/11/26 12:05:59 helly Exp $
dnl
dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -167,10 +167,45 @@
PHP_DBA_STD_ATTACH
])
+AC_ARG_WITH(db4,
+[ --with-db4[=DIR] Include Berkeley DB4 support],[
+ if test "$withval" != "no"; then
+ PHP_DBA_STD_BEGIN
+ for i in $withval /usr/local/BerkeleyDB.4.1 /usr/local/BerkeleyDB.4.0 /usr/local
+/usr; do
+ if test -f "$i/db4/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/db4/db.h
+ break
+ elif test -f "$i/include/db4/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db4/db.h
+ break
+ elif test -f "$i/include/db/db4.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db/db4.h
+ break
+ elif test -f "$i/include/db4.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db4.h
+ break
+ elif test -f "$i/include/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db.h
+ break
+ fi
+ done
+ PHP_DBA_DB_CHECK(4, db-4.1 db-4 db4 db, db_create)
+ fi
+])
+AC_DBA_STD_RESULT(db4,Berkeley DB4)
+
AC_ARG_WITH(db3,
[ --with-db3[=DIR] Include Berkeley DB3 support],[
if test "$withval" != "no"; then
PHP_DBA_STD_BEGIN
+ if test "$HAVE_DB4" = "1"; then
+ AC_DBA_STD_RESULT(db3,Berkeley DB3,You cannot combine --with-db3 with
+--with-db4)
+ fi
for i in $withval /usr/local/BerkeleyDB.3.3 /usr/local/BerkeleyDB.3.2
/usr/local/BerkeleyDB.3.1 /usr/local/BerkeleyDB.3.0 /usr/local /usr; do
if test -f "$i/db3/db.h"; then
THIS_PREFIX=$i
@@ -203,8 +238,8 @@
[ --with-db2[=DIR] Include Berkeley DB2 support],[
if test "$withval" != "no"; then
PHP_DBA_STD_BEGIN
- if test "$HAVE_DB3" = "1"; then
- AC_DBA_STD_RESULT(db2,Berkeley DB2,You cannot combine --with-db2 with
--with-db3)
+ if test "$HAVE_DB3" = "1" -o "$HAVE_DB4" = "1"; then
+ AC_DBA_STD_RESULT(db2,Berkeley DB2,You cannot combine --with-db2 with
+--with-db3 or --with-db4)
fi
for i in $withval $withval/BerkeleyDB /usr/BerkeleyDB /usr/local /usr; do
if test -f "$i/db2/db.h"; then
@@ -339,7 +374,7 @@
if test "$HAVE_DBA" = "1"; then
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_DBA, 1, [ ])
- PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c
dba_db3.c $cdb_sources $flat_sources, $ext_shared)
+ PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c
+dba_db3.c dba_db4.c $cdb_sources $flat_sources, $ext_shared)
PHP_SUBST(DBA_SHARED_LIBADD)
else
AC_MSG_RESULT(no)
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.64 php4/ext/dba/dba.c:1.65
--- php4/ext/dba/dba.c:1.64 Fri Nov 22 10:47:47 2002
+++ php4/ext/dba/dba.c Tue Nov 26 07:05:59 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba.c,v 1.64 2002/11/22 15:47:47 helly Exp $ */
+/* $Id: dba.c,v 1.65 2002/11/26 12:05:59 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -44,6 +44,7 @@
#include "php_cdb.h"
#include "php_db2.h"
#include "php_db3.h"
+#include "php_db4.h"
#include "php_flatfile.h"
/* {{{ dba_functions[]
@@ -195,6 +196,9 @@
#endif
#if DBA_DB3
DBA_HND(db3, DBA_LOCK_ALL) /* No lock in lib */
+#endif
+#if DBA_DB4
+ DBA_HND(db4, DBA_LOCK_ALL) /* No lock in lib */
#endif
#if DBA_FLATFILE
DBA_HND(flatfile, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */
Index: php4/ext/dba/dba_db4.c
+++ php4/ext/dba/dba_db4.c
/*
+----------------------------------------------------------------------+
| PHP Version 4 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2002 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Sascha Schumann <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
/* $Id: dba_db4.c,v 1.1 2002/11/26 12:05:59 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "php.h"
#if DBA_DB4
#include "php_db4.h"
#include <sys/stat.h>
#include <string.h>
#ifdef DB4_INCLUDE_FILE
#include DB4_INCLUDE_FILE
#else
#include <db.h>
#endif
#define DB4_DATA dba_db4_data *dba = info->dbf
#define DB4_GKEY \
DBT gkey; \
memset(&gkey, 0, sizeof(gkey)); \
gkey.data = (char *) key; gkey.size = keylen
typedef struct {
DB *dbp;
DBC *cursor;
} dba_db4_data;
DBA_OPEN_FUNC(db4)
{
DB *dbp = NULL;
DBTYPE type;
int gmode = 0;
int filemode = 0644;
struct stat check_stat;
int s = VCWD_STAT(info->path, &check_stat);
type = info->mode == DBA_READER ? DB_UNKNOWN :
info->mode == DBA_TRUNC ? DB_BTREE :
s? DB_BTREE : DB_UNKNOWN;
gmode = info->mode == DBA_READER ? DB_RDONLY :
(info->mode == DBA_CREAT && s) ? DB_CREATE :
(info->mode == DBA_CREAT && !s) ? 0 :
info->mode == DBA_WRITER ? 0 :
info->mode == DBA_TRUNC ? DB_CREATE | DB_TRUNCATE : -1;
if (gmode == -1)
return FAILURE; /* not possible */
if (info->argc > 0) {
convert_to_long_ex(info->argv[0]);
filemode = Z_LVAL_PP(info->argv[0]);
}
if (db_create(&dbp, NULL, 0) == 0 &&
#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
dbp->open(dbp, 0, info->path, NULL, type, gmode, filemode) ==
0) {
#else
dbp->open(dbp, info->path, NULL, type, gmode, filemode) == 0) {
#endif
dba_db4_data *data;
data = emalloc(sizeof(*data));
data->dbp = dbp;
data->cursor = NULL;
info->dbf = data;
return SUCCESS;
} else if (dbp != NULL) {
dbp->close(dbp, 0);
}
return FAILURE;
}
DBA_CLOSE_FUNC(db4)
{
DB4_DATA;
if (dba->cursor) dba->cursor->c_close(dba->cursor);
dba->dbp->close(dba->dbp, 0);
efree(dba);
}
DBA_FETCH_FUNC(db4)
{
DBT gval;
char *new = NULL;
DB4_DATA;
DB4_GKEY;
memset(&gval, 0, sizeof(gval));
if (!dba->dbp->get(dba->dbp, NULL, &gkey, &gval, 0)) {
if (newlen) *newlen = gval.size;
new = estrndup(gval.data, gval.size);
}
return new;
}
DBA_UPDATE_FUNC(db4)
{
DBT gval;
DB4_DATA;
DB4_GKEY;
memset(&gval, 0, sizeof(gval));
gval.data = (char *) val;
gval.size = vallen;
if (!dba->dbp->put(dba->dbp, NULL, &gkey, &gval,
mode == 1 ? DB_NOOVERWRITE : 0)) {
return SUCCESS;
}
return FAILURE;
}
DBA_EXISTS_FUNC(db4)
{
DBT gval;
DB4_DATA;
DB4_GKEY;
memset(&gval, 0, sizeof(gval));
if (!dba->dbp->get(dba->dbp, NULL, &gkey, &gval, 0)) {
return SUCCESS;
}
return FAILURE;
}
DBA_DELETE_FUNC(db4)
{
DB4_DATA;
DB4_GKEY;
return dba->dbp->del(dba->dbp, NULL, &gkey, 0) ? FAILURE : SUCCESS;
}
DBA_FIRSTKEY_FUNC(db4)
{
DB4_DATA;
if (dba->cursor) {
dba->cursor->c_close(dba->cursor);
}
dba->cursor = NULL;
if (dba->dbp->cursor(dba->dbp, NULL, &dba->cursor, 0) != 0) {
return NULL;
}
/* we should introduce something like PARAM_PASSTHRU... */
return dba_nextkey_db4(info, newlen TSRMLS_CC);
}
DBA_NEXTKEY_FUNC(db4)
{
DB4_DATA;
DBT gkey, gval;
char *nkey = NULL;
memset(&gkey, 0, sizeof(gkey));
memset(&gval, 0, sizeof(gval));
if (dba->cursor->c_get(dba->cursor, &gkey, &gval, DB_NEXT) == 0) {
if (gkey.data) {
nkey = estrndup(gkey.data, gkey.size);
if (newlen) *newlen = gkey.size;
}
}
return nkey;
}
DBA_OPTIMIZE_FUNC(db4)
{
return SUCCESS;
}
DBA_SYNC_FUNC(db4)
{
DB4_DATA;
return dba->dbp->sync(dba->dbp, 0) ? FAILURE : SUCCESS;
}
#endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 fdm=marker
* vim<600: sw=4 ts=4
*/
Index: php4/ext/dba/php_db4.h
+++ php4/ext/dba/php_db4.h
#ifndef PHP_DB4_H
#define PHP_DB4_H
#if DBA_DB4
#include "php_dba.h"
DBA_FUNCS(db4);
#endif
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
